@atlaskit/editor-plugin-table 10.9.6 → 10.9.7

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @atlaskit/editor-plugin-table
 
+## 10.9.7
+
+### Patch Changes
+
+- [#146244](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/146244)
+  [`a87bc29b0ab36`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/a87bc29b0ab36) -
+  [ED-27681] Fix a bug where resize table column and then resize table cannot be undone
+
 ## 10.9.6
 
 ### Patch Changes

package/dist/cjs/nodeviews/TableComponent.js

@@ -254,6 +254,11 @@ var TableComponent = /*#__PURE__*/function (_React$Component) {
       )(state.tr);
       if (!isUserTriggered) {
         (0, _collab.tintDirtyTransaction)(tr);
+        if ((0, _platformFeatureFlags.fg)('platform_editor_fix_table_resizing_undo')) {
+          // Avoid adding this transaction separately to the history as these are automatic updates
+          // as a consequence of another action
+          tr.setMeta('addToHistory', false);
+        }
       }
       dispatch(tr);
     });

package/dist/cjs/pm-plugins/table-resizing/utils/scale-table.js

@@ -10,6 +10,7 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _nodeWidth = require("@atlaskit/editor-common/node-width");
 var _styles = require("@atlaskit/editor-common/styles");
 var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _columnWidth = require("../../transforms/column-width");
 var _nodes = require("../../utils/nodes");
 var _misc = require("../utils/misc");
@@ -177,9 +178,9 @@ var scaleTable = exports.scaleTable = function scaleTable(tableRef, options, dom
     }
     if (resizeState) {
       tr = (0, _columnWidth.updateColumnWidths)(resizeState, node, start, api)(tr);
-      // Avoid adding this transaction separately to the history as these are automatic updates
-      // as a consequence of another action
-      tr.setMeta('addToHistory', false);
+      if (!(0, _platformFeatureFlags.fg)('platform_editor_fix_table_resizing_undo')) {
+        tr.setMeta('addToHistory', false);
+      }
       if (tr.docChanged) {
         tr.setMeta('scrollIntoView', false);
         // TODO: ED-8995 - We need to do this check to reduce the number of race conditions when working with tables.

package/dist/es2019/nodeviews/TableComponent.js

@@ -248,6 +248,11 @@ class TableComponent extends React.Component {
       )(state.tr);
       if (!isUserTriggered) {
         tintDirtyTransaction(tr);
+        if (fg('platform_editor_fix_table_resizing_undo')) {
+          // Avoid adding this transaction separately to the history as these are automatic updates
+          // as a consequence of another action
+          tr.setMeta('addToHistory', false);
+        }
       }
       dispatch(tr);
     });

package/dist/es2019/pm-plugins/table-resizing/utils/scale-table.js

@@ -1,6 +1,7 @@
 import { getTableContainerWidth } from '@atlaskit/editor-common/node-width';
 import { tableCellMinWidth } from '@atlaskit/editor-common/styles';
 import { akEditorTableNumberColumnWidth } from '@atlaskit/editor-shared-styles';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { updateColumnWidths } from '../../transforms/column-width';
 import { getTableWidth } from '../../utils/nodes';
 import { getLayoutSize } from '../utils/misc';
@@ -163,9 +164,9 @@ export const scaleTable = (tableRef, options, domAtPos, api, isTableScalingEnabl
   }
   if (resizeState) {
     tr = updateColumnWidths(resizeState, node, start, api)(tr);
-    // Avoid adding this transaction separately to the history as these are automatic updates
-    // as a consequence of another action
-    tr.setMeta('addToHistory', false);
+    if (!fg('platform_editor_fix_table_resizing_undo')) {
+      tr.setMeta('addToHistory', false);
+    }
     if (tr.docChanged) {
       tr.setMeta('scrollIntoView', false);
       // TODO: ED-8995 - We need to do this check to reduce the number of race conditions when working with tables.

package/dist/esm/nodeviews/TableComponent.js

@@ -248,6 +248,11 @@ var TableComponent = /*#__PURE__*/function (_React$Component) {
       )(state.tr);
       if (!isUserTriggered) {
         tintDirtyTransaction(tr);
+        if (fg('platform_editor_fix_table_resizing_undo')) {
+          // Avoid adding this transaction separately to the history as these are automatic updates
+          // as a consequence of another action
+          tr.setMeta('addToHistory', false);
+        }
       }
       dispatch(tr);
     });

package/dist/esm/pm-plugins/table-resizing/utils/scale-table.js

@@ -4,6 +4,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 import { getTableContainerWidth } from '@atlaskit/editor-common/node-width';
 import { tableCellMinWidth } from '@atlaskit/editor-common/styles';
 import { akEditorTableNumberColumnWidth } from '@atlaskit/editor-shared-styles';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { updateColumnWidths } from '../../transforms/column-width';
 import { getTableWidth } from '../../utils/nodes';
 import { getLayoutSize } from '../utils/misc';
@@ -169,9 +170,9 @@ export var scaleTable = function scaleTable(tableRef, options, domAtPos, api) {
     }
     if (resizeState) {
       tr = updateColumnWidths(resizeState, node, start, api)(tr);
-      // Avoid adding this transaction separately to the history as these are automatic updates
-      // as a consequence of another action
-      tr.setMeta('addToHistory', false);
+      if (!fg('platform_editor_fix_table_resizing_undo')) {
+        tr.setMeta('addToHistory', false);
+      }
       if (tr.docChanged) {
         tr.setMeta('scrollIntoView', false);
         // TODO: ED-8995 - We need to do this check to reduce the number of race conditions when working with tables.

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-table",
-	"version": "10.9.6",
+	"version": "10.9.7",
 	"description": "Table plugin for the @atlaskit/editor",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -32,7 +32,7 @@
 		"@atlaskit/adf-schema": "^47.6.0",
 		"@atlaskit/button": "^23.0.0",
 		"@atlaskit/custom-steps": "^0.11.0",
-		"@atlaskit/editor-common": "^103.16.0",
+		"@atlaskit/editor-common": "^103.17.0",
 		"@atlaskit/editor-palette": "^2.1.0",
 		"@atlaskit/editor-plugin-accessibility-utils": "^2.0.0",
 		"@atlaskit/editor-plugin-analytics": "^2.2.0",
@@ -206,6 +206,9 @@
 		},
 		"platform_editor_controls_patch_6": {
 			"type": "boolean"
+		},
+		"platform_editor_fix_table_resizing_undo": {
+			"type": "boolean"
 		}
 	}
 }

package/src/nodeviews/TableComponent.tsx

@@ -1308,6 +1308,11 @@ class TableComponent extends React.Component<ComponentProps, TableState> {
 
 		if (!isUserTriggered) {
 			tintDirtyTransaction(tr);
+			if (fg('platform_editor_fix_table_resizing_undo')) {
+				// Avoid adding this transaction separately to the history as these are automatic updates
+				// as a consequence of another action
+				tr.setMeta('addToHistory', false);
+			}
 		}
 
 		dispatch(tr);

package/src/pm-plugins/table-resizing/utils/scale-table.ts

@@ -4,6 +4,7 @@ import type { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
 import type { Transaction } from '@atlaskit/editor-prosemirror/state';
 import type { DomAtPos } from '@atlaskit/editor-prosemirror/utils';
 import { akEditorTableNumberColumnWidth } from '@atlaskit/editor-shared-styles';
+import { fg } from '@atlaskit/platform-feature-flags';
 
 import type { PluginInjectionAPI } from '../../../types';
 import { updateColumnWidths } from '../../transforms/column-width';
@@ -267,9 +268,10 @@ export const scaleTable =
 
 		if (resizeState) {
 			tr = updateColumnWidths(resizeState, node, start, api)(tr);
-			// Avoid adding this transaction separately to the history as these are automatic updates
-			// as a consequence of another action
-			tr.setMeta('addToHistory', false);
+
+			if (!fg('platform_editor_fix_table_resizing_undo')) {
+				tr.setMeta('addToHistory', false);
+			}
 
 			if (tr.docChanged) {
 				tr.setMeta('scrollIntoView', false);

package/src/ui/TableFloatingColumnControls/ColumnControls/index.tsx

@@ -107,7 +107,7 @@ export const ColumnControls = ({
 	const hasHeaderRow = firstRow ? firstRow.getAttribute('data-header-row') : false;
 
 	const rowControlStickyTop = 45;
-	const marginTop = hasHeaderRow && stickyTop !== undefined ? (rowControlStickyTop ?? 0) : 0;
+	const marginTop = hasHeaderRow && stickyTop !== undefined ? rowControlStickyTop ?? 0 : 0;
 
 	const handleClick = useCallback(
 		(event: MouseEvent) => {

package/src/ui/TableFloatingControls/NumberColumn/index.tsx

@@ -103,10 +103,10 @@ export default class NumberColumn extends Component<Props, any> {
 			const newPos =
 				selection.head > pos
 					? // Selection is after table
-					// nodeSize - 3 will move the position inside last table cell
-					Selection.near(doc.resolve(pos + ($pos.parent.nodeSize - 3)), -1)
+						// nodeSize - 3 will move the position inside last table cell
+						Selection.near(doc.resolve(pos + ($pos.parent.nodeSize - 3)), -1)
 					: // Selection is before table
-					Selection.near($pos);
+						Selection.near($pos);
 			editorView.dispatch(tr.setSelection(newPos));
 		}
 		selectRow(index, event.shiftKey);