@atlaskit/editor-plugin-table 7.5.14 → 7.5.15

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @atlaskit/editor-plugin-table
 
+## 7.5.15
+
+### Patch Changes
+
+- [#83567](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/83567) [`755de34e0656`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/755de34e0656) - fix preserve table width copy paste and resizing to full width behaviour
+- Updated dependencies
+
 ## 7.5.14
 
 ### Patch Changes

package/dist/cjs/nodeviews/TableComponent.js

@@ -457,15 +457,20 @@ var TableComponent = /*#__PURE__*/function (_React$Component) {
         return;
       }
       var tableNodeWidth = (0, _nodeWidth.getTableContainerWidth)(tableNode);
-      var shouldTableScale = tableRenderWidth < tableNodeWidth;
-      if (force || shouldTableScale) {
+      var isTableResizedFullWidth = tableNodeWidth === 1800 && this.wasResizing && !isResizing;
+      // Needed for undo / redo
+      var isTableWidthChanged = tableNodeWidth !== this.tableNodeWidth;
+      var isTableSquashed = tableRenderWidth < tableNodeWidth;
+      var maybeScale = isTableSquashed || isTableWidthChanged || isTableResizedFullWidth;
+      if (force || maybeScale) {
         var _this$containerWidth;
         var containerWidthValue = containerWidth.width;
         var isWidthChanged = ((_this$containerWidth = this.containerWidth) === null || _this$containerWidth === void 0 ? void 0 : _this$containerWidth.width) !== containerWidthValue;
         var wasTableResized = (0, _colgroup.hasTableBeenResized)(this.node);
-        var isTableResied = (0, _colgroup.hasTableBeenResized)(tableNode);
-        var isColumnsDistributed = wasTableResized && !isTableResied;
-        if (force || !isResizing && (isWidthChanged || isColumnsDistributed)) {
+        var isTableResized = (0, _colgroup.hasTableBeenResized)(tableNode);
+        var isColumnsDistributed = wasTableResized && !isTableResized;
+        var shouldScale = isWidthChanged || isColumnsDistributed || isTableResizedFullWidth || isTableWidthChanged;
+        if (force || !isResizing && shouldScale) {
           var resizeState = (0, _utils4.getResizeState)({
             minWidth: _utils4.COLUMN_MIN_WIDTH,
             maxSize: tableRenderWidth,
@@ -482,6 +487,8 @@ var TableComponent = /*#__PURE__*/function (_React$Component) {
           });
         }
       }
+      this.tableNodeWidth = tableNodeWidth;
+      this.wasResizing = isResizing;
       this.containerWidth = containerWidth;
     }
   }, {

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

@@ -51,7 +51,8 @@ var getResizeState = exports.getResizeState = function getResizeState(_ref) {
       widths: _widths,
       maxSize: maxSize,
       tableWidth: _tableWidth,
-      overflow: _overflow
+      overflow: _overflow,
+      isScaled: isTableScalingEnabled
     };
   }
   var shouldReinsertColgroup = !isTableScalingEnabled;
@@ -85,7 +86,8 @@ var getResizeState = exports.getResizeState = function getResizeState(_ref) {
     widths: widths,
     maxSize: maxSize,
     tableWidth: tableWidth,
-    overflow: overflow
+    overflow: overflow,
+    isScaled: isTableScalingEnabled
   };
 };
 

package/dist/cjs/transforms/column-width.js

@@ -33,6 +33,10 @@ var updateColumnWidths = exports.updateColumnWidths = function updateColumnWidth
     for (var columnIndex = 0; columnIndex < map.width; columnIndex++) {
       for (var rowIndex = 0; rowIndex < map.height; rowIndex++) {
         var width = resizeState.cols[columnIndex].width;
+        if (resizeState.isScaled) {
+          // Ensure that the width is an integer if the table has been scaled
+          width = Math.floor(width);
+        }
         var mapIndex = rowIndex * map.width + columnIndex;
         var cellPos = map.map[mapIndex];
         var attrs = updatedCellsAttrs[cellPos] || _objectSpread({}, table.nodeAt(cellPos).attrs);

package/dist/es2019/nodeviews/TableComponent.js

@@ -439,17 +439,22 @@ class TableComponent extends React.Component {
       return;
     }
     const tableNodeWidth = getTableContainerWidth(tableNode);
-    const shouldTableScale = tableRenderWidth < tableNodeWidth;
-    if (force || shouldTableScale) {
+    const isTableResizedFullWidth = tableNodeWidth === 1800 && this.wasResizing && !isResizing;
+    // Needed for undo / redo
+    const isTableWidthChanged = tableNodeWidth !== this.tableNodeWidth;
+    const isTableSquashed = tableRenderWidth < tableNodeWidth;
+    const maybeScale = isTableSquashed || isTableWidthChanged || isTableResizedFullWidth;
+    if (force || maybeScale) {
       var _this$containerWidth;
       const {
         width: containerWidthValue
       } = containerWidth;
       const isWidthChanged = ((_this$containerWidth = this.containerWidth) === null || _this$containerWidth === void 0 ? void 0 : _this$containerWidth.width) !== containerWidthValue;
       const wasTableResized = hasTableBeenResized(this.node);
-      const isTableResied = hasTableBeenResized(tableNode);
-      const isColumnsDistributed = wasTableResized && !isTableResied;
-      if (force || !isResizing && (isWidthChanged || isColumnsDistributed)) {
+      const isTableResized = hasTableBeenResized(tableNode);
+      const isColumnsDistributed = wasTableResized && !isTableResized;
+      const shouldScale = isWidthChanged || isColumnsDistributed || isTableResizedFullWidth || isTableWidthChanged;
+      if (force || !isResizing && shouldScale) {
         const resizeState = getResizeState({
           minWidth: COLUMN_MIN_WIDTH,
           maxSize: tableRenderWidth,
@@ -466,6 +471,8 @@ class TableComponent extends React.Component {
         });
       }
     }
+    this.tableNodeWidth = tableNodeWidth;
+    this.wasResizing = isResizing;
     this.containerWidth = containerWidth;
   }
   componentDidUpdate(_, prevState) {

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

@@ -35,7 +35,8 @@ export const getResizeState = ({
       widths,
       maxSize,
       tableWidth,
-      overflow
+      overflow,
+      isScaled: isTableScalingEnabled
     };
   }
   const shouldReinsertColgroup = !isTableScalingEnabled;
@@ -65,7 +66,8 @@ export const getResizeState = ({
     widths,
     maxSize,
     tableWidth,
-    overflow
+    overflow,
+    isScaled: isTableScalingEnabled
   };
 };
 

package/dist/es2019/transforms/column-width.js

@@ -22,9 +22,13 @@ export const updateColumnWidths = (resizeState, table, start) => tr => {
   // calculating new attributes for each cell
   for (let columnIndex = 0; columnIndex < map.width; columnIndex++) {
     for (let rowIndex = 0; rowIndex < map.height; rowIndex++) {
-      const {
+      let {
         width
       } = resizeState.cols[columnIndex];
+      if (resizeState.isScaled) {
+        // Ensure that the width is an integer if the table has been scaled
+        width = Math.floor(width);
+      }
       const mapIndex = rowIndex * map.width + columnIndex;
       const cellPos = map.map[mapIndex];
       const attrs = updatedCellsAttrs[cellPos] || {

package/dist/esm/nodeviews/TableComponent.js

@@ -450,15 +450,20 @@ var TableComponent = /*#__PURE__*/function (_React$Component) {
         return;
       }
       var tableNodeWidth = getTableContainerWidth(tableNode);
-      var shouldTableScale = tableRenderWidth < tableNodeWidth;
-      if (force || shouldTableScale) {
+      var isTableResizedFullWidth = tableNodeWidth === 1800 && this.wasResizing && !isResizing;
+      // Needed for undo / redo
+      var isTableWidthChanged = tableNodeWidth !== this.tableNodeWidth;
+      var isTableSquashed = tableRenderWidth < tableNodeWidth;
+      var maybeScale = isTableSquashed || isTableWidthChanged || isTableResizedFullWidth;
+      if (force || maybeScale) {
         var _this$containerWidth;
         var containerWidthValue = containerWidth.width;
         var isWidthChanged = ((_this$containerWidth = this.containerWidth) === null || _this$containerWidth === void 0 ? void 0 : _this$containerWidth.width) !== containerWidthValue;
         var wasTableResized = hasTableBeenResized(this.node);
-        var isTableResied = hasTableBeenResized(tableNode);
-        var isColumnsDistributed = wasTableResized && !isTableResied;
-        if (force || !isResizing && (isWidthChanged || isColumnsDistributed)) {
+        var isTableResized = hasTableBeenResized(tableNode);
+        var isColumnsDistributed = wasTableResized && !isTableResized;
+        var shouldScale = isWidthChanged || isColumnsDistributed || isTableResizedFullWidth || isTableWidthChanged;
+        if (force || !isResizing && shouldScale) {
           var resizeState = getResizeState({
             minWidth: COLUMN_MIN_WIDTH,
             maxSize: tableRenderWidth,
@@ -475,6 +480,8 @@ var TableComponent = /*#__PURE__*/function (_React$Component) {
           });
         }
       }
+      this.tableNodeWidth = tableNodeWidth;
+      this.wasResizing = isResizing;
       this.containerWidth = containerWidth;
     }
   }, {

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

@@ -44,7 +44,8 @@ export var getResizeState = function getResizeState(_ref) {
       widths: _widths,
       maxSize: maxSize,
       tableWidth: _tableWidth,
-      overflow: _overflow
+      overflow: _overflow,
+      isScaled: isTableScalingEnabled
     };
   }
   var shouldReinsertColgroup = !isTableScalingEnabled;
@@ -78,7 +79,8 @@ export var getResizeState = function getResizeState(_ref) {
     widths: widths,
     maxSize: maxSize,
     tableWidth: tableWidth,
-    overflow: overflow
+    overflow: overflow,
+    isScaled: isTableScalingEnabled
   };
 };
 

package/dist/esm/transforms/column-width.js

@@ -27,6 +27,10 @@ export var updateColumnWidths = function updateColumnWidths(resizeState, table,
     for (var columnIndex = 0; columnIndex < map.width; columnIndex++) {
       for (var rowIndex = 0; rowIndex < map.height; rowIndex++) {
         var width = resizeState.cols[columnIndex].width;
+        if (resizeState.isScaled) {
+          // Ensure that the width is an integer if the table has been scaled
+          width = Math.floor(width);
+        }
         var mapIndex = rowIndex * map.width + columnIndex;
         var cellPos = map.map[mapIndex];
         var attrs = updatedCellsAttrs[cellPos] || _objectSpread({}, table.nodeAt(cellPos).attrs);

package/dist/types/nodeviews/TableComponent.d.ts

@@ -47,6 +47,8 @@ declare class TableComponent extends React.Component<ComponentProps, TableState>
     private table?;
     private node;
     private containerWidth?;
+    private wasResizing?;
+    private tableNodeWidth?;
     private layoutSize?;
     private overflowShadowsObserver?;
     private stickyScrollbar?;

package/dist/types/pm-plugins/table-resizing/utils/types.d.ts

@@ -6,6 +6,7 @@ export interface ResizeState {
     maxSize: number;
     overflow: boolean;
     tableWidth: number;
+    isScaled?: boolean;
 }
 export interface ResizeStateWithAnalytics {
     resizeState: ResizeState;

package/dist/types-ts4.5/nodeviews/TableComponent.d.ts

@@ -47,6 +47,8 @@ declare class TableComponent extends React.Component<ComponentProps, TableState>
     private table?;
     private node;
     private containerWidth?;
+    private wasResizing?;
+    private tableNodeWidth?;
     private layoutSize?;
     private overflowShadowsObserver?;
     private stickyScrollbar?;

package/dist/types-ts4.5/pm-plugins/table-resizing/utils/types.d.ts

@@ -6,6 +6,7 @@ export interface ResizeState {
     maxSize: number;
     overflow: boolean;
     tableWidth: number;
+    isScaled?: boolean;
 }
 export interface ResizeStateWithAnalytics {
     resizeState: ResizeState;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-plugin-table",
-  "version": "7.5.14",
+  "version": "7.5.15",
   "description": "Table plugin for the @atlaskit/editor",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -43,7 +43,7 @@
     "@atlaskit/icon": "^22.1.0",
     "@atlaskit/menu": "^2.1.5",
     "@atlaskit/platform-feature-flags": "^0.2.1",
-    "@atlaskit/pragmatic-drag-and-drop": "^1.0.0",
+    "@atlaskit/pragmatic-drag-and-drop": "^1.1.0",
     "@atlaskit/pragmatic-drag-and-drop-auto-scroll": "^1.0.0",
     "@atlaskit/pragmatic-drag-and-drop-hitbox": "^1.0.0",
     "@atlaskit/primitives": "^5.1.0",

package/src/nodeviews/TableComponent.tsx

@@ -140,6 +140,8 @@ class TableComponent extends React.Component<ComponentProps, TableState> {
   private table?: HTMLTableElement | null;
   private node: PmNode;
   private containerWidth?: EditorContainerWidth;
+  private wasResizing?: boolean;
+  private tableNodeWidth?: number;
   private layoutSize?: number;
   private overflowShadowsObserver?: OverflowShadowsObserver;
   private stickyScrollbar?: TableStickyScrollbar;
@@ -338,16 +340,26 @@ class TableComponent extends React.Component<ComponentProps, TableState> {
     }
 
     const tableNodeWidth = getTableContainerWidth(tableNode);
-    const shouldTableScale = tableRenderWidth < tableNodeWidth;
-    if (force || shouldTableScale) {
+    const isTableResizedFullWidth =
+      tableNodeWidth === 1800 && this.wasResizing && !isResizing;
+    // Needed for undo / redo
+    const isTableWidthChanged = tableNodeWidth !== this.tableNodeWidth;
+    const isTableSquashed = tableRenderWidth < tableNodeWidth;
+
+    const maybeScale =
+      isTableSquashed || isTableWidthChanged || isTableResizedFullWidth;
+    if (force || maybeScale) {
       const { width: containerWidthValue } = containerWidth;
       const isWidthChanged = this.containerWidth?.width !== containerWidthValue;
-
       const wasTableResized = hasTableBeenResized(this.node);
-      const isTableResied = hasTableBeenResized(tableNode);
-      const isColumnsDistributed = wasTableResized && !isTableResied;
-
-      if (force || (!isResizing && (isWidthChanged || isColumnsDistributed))) {
+      const isTableResized = hasTableBeenResized(tableNode);
+      const isColumnsDistributed = wasTableResized && !isTableResized;
+      const shouldScale =
+        isWidthChanged ||
+        isColumnsDistributed ||
+        isTableResizedFullWidth ||
+        isTableWidthChanged;
+      if (force || (!isResizing && shouldScale)) {
         const resizeState = getResizeState({
           minWidth: COLUMN_MIN_WIDTH,
           maxSize: tableRenderWidth,
@@ -364,6 +376,8 @@ class TableComponent extends React.Component<ComponentProps, TableState> {
         });
       }
     }
+    this.tableNodeWidth = tableNodeWidth;
+    this.wasResizing = isResizing;
     this.containerWidth = containerWidth;
   }
 

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

@@ -63,6 +63,7 @@ export const getResizeState = ({
       maxSize,
       tableWidth,
       overflow,
+      isScaled: isTableScalingEnabled,
     };
   }
 
@@ -101,6 +102,7 @@ export const getResizeState = ({
     maxSize,
     tableWidth,
     overflow,
+    isScaled: isTableScalingEnabled,
   };
 };
 

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

@@ -8,6 +8,7 @@ export interface ResizeState {
   maxSize: number;
   overflow: boolean;
   tableWidth: number;
+  isScaled?: boolean;
 }
 export interface ResizeStateWithAnalytics {
   resizeState: ResizeState;

package/src/transforms/column-width.ts

@@ -35,7 +35,11 @@ export const updateColumnWidths =
     // calculating new attributes for each cell
     for (let columnIndex = 0; columnIndex < map.width; columnIndex++) {
       for (let rowIndex = 0; rowIndex < map.height; rowIndex++) {
-        const { width } = resizeState.cols[columnIndex];
+        let { width } = resizeState.cols[columnIndex];
+        if (resizeState.isScaled) {
+          // Ensure that the width is an integer if the table has been scaled
+          width = Math.floor(width);
+        }
         const mapIndex = rowIndex * map.width + columnIndex;
         const cellPos = map.map[mapIndex];
         const attrs = updatedCellsAttrs[cellPos] || {