@atlaskit/editor-plugin-table 7.5.7 → 7.5.9

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @atlaskit/editor-plugin-table
 
+## 7.5.9
+
+### Patch Changes
+
+- [#81302](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/81302) [`969e899b8844`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/969e899b8844) - Update column resize logic to match mouse movement
+- [#81427](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/81427) [`8adea3fa8973`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/8adea3fa8973) - [ux] When number column toggled and preserve table widths ff enabled, the table oveflow state should align with current behaviour.
+
+## 7.5.8
+
+### Patch Changes
+
+- [#80679](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/80679) [`104eb9443b7e`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/104eb9443b7e) - ED-22553 Updating adf-schema version to 35.6.0
+- Updated dependencies
+
 ## 7.5.7
 
 ### Patch Changes

package/dist/cjs/nodeviews/TableComponent.js

@@ -185,8 +185,7 @@ var TableComponent = /*#__PURE__*/function (_React$Component) {
         getNode = _this$props2.getNode,
         getPos = _this$props2.getPos,
         containerWidth = _this$props2.containerWidth,
-        options = _this$props2.options,
-        isTableScalingEnabled = _this$props2.isTableScalingEnabled;
+        options = _this$props2.options;
       var node = getNode();
       var state = view.state,
         dispatch = view.dispatch;
@@ -203,7 +202,7 @@ var TableComponent = /*#__PURE__*/function (_React$Component) {
         start: pos + 1,
         containerWidth: width,
         previousContainerWidth: _this.containerWidth.width || width
-      }, options), domAtPos, isTableScalingEnabled)(state.tr);
+      }, options), domAtPos, false)(state.tr);
       dispatch(tr);
     });
     (0, _defineProperty3.default)((0, _assertThisInitialized2.default)(_this), "setTimerToSendInitialOverflowCaptured", function (isOverflowing) {

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

@@ -4,13 +4,20 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.resizeColumn = void 0;
+var _misc = require("./misc");
 var _resizeLogic = require("./resize-logic");
 var _resizeState = require("./resize-state");
 // Resize a given column by an amount from the current state
 
 var resizeColumn = exports.resizeColumn = function resizeColumn(resizeState, colIndex, amount, tableRef, tableNode, selectedColumns) {
   var isTableScalingEnabled = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : false;
-  var newState = amount > 0 ? (0, _resizeLogic.growColumn)(resizeState, colIndex, amount, selectedColumns) : amount < 0 ? (0, _resizeLogic.shrinkColumn)(resizeState, colIndex, amount, selectedColumns) : resizeState;
+  var scalePercent = 1;
+  var resizeAmount = amount;
+  if (isTableScalingEnabled) {
+    scalePercent = (0, _misc.getTableScalingPercent)(tableNode, tableRef);
+    resizeAmount = amount / scalePercent;
+  }
+  var newState = resizeAmount > 0 ? (0, _resizeLogic.growColumn)(resizeState, colIndex, resizeAmount, selectedColumns) : resizeAmount < 0 ? (0, _resizeLogic.shrinkColumn)(resizeState, colIndex, resizeAmount, selectedColumns) : resizeState;
   (0, _resizeState.updateColgroup)(newState, tableRef, tableNode, isTableScalingEnabled);
   return newState;
 };

package/dist/es2019/nodeviews/TableComponent.js

@@ -169,8 +169,7 @@ class TableComponent extends React.Component {
         getNode,
         getPos,
         containerWidth,
-        options,
-        isTableScalingEnabled
+        options
       } = this.props;
       const node = getNode();
       const {
@@ -194,7 +193,7 @@ class TableComponent extends React.Component {
         containerWidth: width,
         previousContainerWidth: this.containerWidth.width || width,
         ...options
-      }, domAtPos, isTableScalingEnabled)(state.tr);
+      }, domAtPos, false)(state.tr);
       dispatch(tr);
     });
     _defineProperty(this, "setTimerToSendInitialOverflowCaptured", isOverflowing => {

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

@@ -1,9 +1,16 @@
 // Resize a given column by an amount from the current state
 
+import { getTableScalingPercent } from './misc';
 import { growColumn, shrinkColumn } from './resize-logic';
 import { updateColgroup } from './resize-state';
 export const resizeColumn = (resizeState, colIndex, amount, tableRef, tableNode, selectedColumns, isTableScalingEnabled = false) => {
-  const newState = amount > 0 ? growColumn(resizeState, colIndex, amount, selectedColumns) : amount < 0 ? shrinkColumn(resizeState, colIndex, amount, selectedColumns) : resizeState;
+  let scalePercent = 1;
+  let resizeAmount = amount;
+  if (isTableScalingEnabled) {
+    scalePercent = getTableScalingPercent(tableNode, tableRef);
+    resizeAmount = amount / scalePercent;
+  }
+  const newState = resizeAmount > 0 ? growColumn(resizeState, colIndex, resizeAmount, selectedColumns) : resizeAmount < 0 ? shrinkColumn(resizeState, colIndex, resizeAmount, selectedColumns) : resizeState;
   updateColgroup(newState, tableRef, tableNode, isTableScalingEnabled);
   return newState;
 };

package/dist/esm/nodeviews/TableComponent.js

@@ -178,8 +178,7 @@ var TableComponent = /*#__PURE__*/function (_React$Component) {
         getNode = _this$props2.getNode,
         getPos = _this$props2.getPos,
         containerWidth = _this$props2.containerWidth,
-        options = _this$props2.options,
-        isTableScalingEnabled = _this$props2.isTableScalingEnabled;
+        options = _this$props2.options;
       var node = getNode();
       var state = view.state,
         dispatch = view.dispatch;
@@ -196,7 +195,7 @@ var TableComponent = /*#__PURE__*/function (_React$Component) {
         start: pos + 1,
         containerWidth: width,
         previousContainerWidth: _this.containerWidth.width || width
-      }, options), domAtPos, isTableScalingEnabled)(state.tr);
+      }, options), domAtPos, false)(state.tr);
       dispatch(tr);
     });
     _defineProperty(_assertThisInitialized(_this), "setTimerToSendInitialOverflowCaptured", function (isOverflowing) {

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

@@ -1,10 +1,17 @@
 // Resize a given column by an amount from the current state
 
+import { getTableScalingPercent } from './misc';
 import { growColumn, shrinkColumn } from './resize-logic';
 import { updateColgroup } from './resize-state';
 export var resizeColumn = function resizeColumn(resizeState, colIndex, amount, tableRef, tableNode, selectedColumns) {
   var isTableScalingEnabled = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : false;
-  var newState = amount > 0 ? growColumn(resizeState, colIndex, amount, selectedColumns) : amount < 0 ? shrinkColumn(resizeState, colIndex, amount, selectedColumns) : resizeState;
+  var scalePercent = 1;
+  var resizeAmount = amount;
+  if (isTableScalingEnabled) {
+    scalePercent = getTableScalingPercent(tableNode, tableRef);
+    resizeAmount = amount / scalePercent;
+  }
+  var newState = resizeAmount > 0 ? growColumn(resizeState, colIndex, resizeAmount, selectedColumns) : resizeAmount < 0 ? shrinkColumn(resizeState, colIndex, resizeAmount, selectedColumns) : resizeState;
   updateColgroup(newState, tableRef, tableNode, isTableScalingEnabled);
   return newState;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-plugin-table",
-  "version": "7.5.7",
+  "version": "7.5.9",
   "description": "Table plugin for the @atlaskit/editor",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -28,8 +28,8 @@
     "runReact18": false
   },
   "dependencies": {
-    "@atlaskit/adf-schema": "^35.5.2",
-    "@atlaskit/custom-steps": "^0.0.14",
+    "@atlaskit/adf-schema": "^35.6.0",
+    "@atlaskit/custom-steps": "^0.0.15",
     "@atlaskit/editor-common": "^78.12.0",
     "@atlaskit/editor-palette": "1.5.2",
     "@atlaskit/editor-plugin-analytics": "^1.0.0",

package/src/nodeviews/TableComponent.tsx

@@ -888,14 +888,7 @@ class TableComponent extends React.Component<ComponentProps, TableState> {
     layoutChanged: boolean;
     parentWidth?: number;
   }) => {
-    const {
-      view,
-      getNode,
-      getPos,
-      containerWidth,
-      options,
-      isTableScalingEnabled,
-    } = this.props;
+    const { view, getNode, getPos, containerWidth, options } = this.props;
     const node = getNode();
     const { state, dispatch } = view;
     const pos = getPos();
@@ -920,7 +913,7 @@ class TableComponent extends React.Component<ComponentProps, TableState> {
         ...options,
       },
       domAtPos,
-      isTableScalingEnabled,
+      false,
     )(state.tr);
 
     dispatch(tr);

package/src/pm-plugins/table-resizing/utils/resize-column.ts

@@ -1,6 +1,7 @@
 // Resize a given column by an amount from the current state
 import type { Node as PmNode } from '@atlaskit/editor-prosemirror/model';
 
+import { getTableScalingPercent } from './misc';
 import { growColumn, shrinkColumn } from './resize-logic';
 import { updateColgroup } from './resize-state';
 import type { ResizeState } from './types';
@@ -14,11 +15,18 @@ export const resizeColumn = (
   selectedColumns?: number[],
   isTableScalingEnabled = false,
 ): ResizeState => {
+  let scalePercent = 1;
+  let resizeAmount = amount;
+
+  if (isTableScalingEnabled) {
+    scalePercent = getTableScalingPercent(tableNode, tableRef);
+    resizeAmount = amount / scalePercent;
+  }
   const newState =
-    amount > 0
-      ? growColumn(resizeState, colIndex, amount, selectedColumns)
-      : amount < 0
-      ? shrinkColumn(resizeState, colIndex, amount, selectedColumns)
+    resizeAmount > 0
+      ? growColumn(resizeState, colIndex, resizeAmount, selectedColumns)
+      : resizeAmount < 0
+      ? shrinkColumn(resizeState, colIndex, resizeAmount, selectedColumns)
       : resizeState;
 
   updateColgroup(newState, tableRef, tableNode, isTableScalingEnabled);