@atlaskit/editor-plugin-table 7.19.1 → 7.19.3

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @atlaskit/editor-plugin-table
 
+## 7.19.3
+
+### Patch Changes
+
+- [#114530](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/114530)
+  [`3b9fcf5e7a8bd`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/3b9fcf5e7a8bd) -
+  [ux] Fix increased scaling percent check
+
+## 7.19.2
+
+### Patch Changes
+
+- [#115086](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/115086)
+  [`e22c1261d6b17`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/e22c1261d6b17) -
+  Add a tint to table transactions that are not created by users to avoid issues for view only live
+  pages
+- Updated dependencies
+
 ## 7.19.1
 
 ### Patch Changes

package/dist/cjs/nodeviews/TableComponent.js

@@ -19,6 +19,7 @@ var _memoizeOne = _interopRequireDefault(require("memoize-one"));
 var _rafSchd = _interopRequireDefault(require("raf-schd"));
 var _reactIntlNext = require("react-intl-next");
 var _analytics = require("@atlaskit/editor-common/analytics");
+var _collab = require("@atlaskit/editor-common/collab");
 var _nodeWidth = require("@atlaskit/editor-common/node-width");
 var _styles = require("@atlaskit/editor-common/styles");
 var _utils = require("@atlaskit/editor-common/utils");
@@ -164,7 +165,7 @@ var TableComponent = /*#__PURE__*/function (_React$Component) {
         if (shouldScaleTable) {
           _this.scaleTable({
             parentWidth: parentWidth
-          });
+          }, hasNumberedColumnChanged);
         }
 
         // only when table resizing is enabled and toggle numbered column to run scaleTable
@@ -172,7 +173,7 @@ var TableComponent = /*#__PURE__*/function (_React$Component) {
           if (!(0, _colgroup.hasTableBeenResized)(prevNode)) {
             _this.scaleTable({
               parentWidth: node.attrs.width
-            });
+            }, true);
           }
         }
         _this.updateParentWidth(parentWidth);
@@ -183,6 +184,7 @@ var TableComponent = /*#__PURE__*/function (_React$Component) {
     });
     // Function gets called when table is nested.
     (0, _defineProperty3.default)((0, _assertThisInitialized2.default)(_this), "scaleTable", function (scaleOptions) {
+      var isUserTriggered = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
       var _this$props2 = _this.props,
         view = _this$props2.view,
         getNode = _this$props2.getNode,
@@ -209,6 +211,9 @@ var TableComponent = /*#__PURE__*/function (_React$Component) {
       // isTableScalingEnabled doesn't change the behavior of nested tables
       false // shouldUseIncreasedScalingPercent set to false for nested tables
       )(state.tr);
+      if (!isUserTriggered) {
+        (0, _collab.tintDirtyTransaction)(tr);
+      }
       dispatch(tr);
     });
     (0, _defineProperty3.default)((0, _assertThisInitialized2.default)(_this), "setTimerToSendInitialOverflowCaptured", function (isOverflowing) {

package/dist/cjs/plugin.js

@@ -73,8 +73,7 @@ var tablesPlugin = function tablesPlugin(_ref) {
   };
   var editorAnalyticsAPI = api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions;
   var isTableFixedColumnWidthsOptionEnabled = (options === null || options === void 0 || (_options$getEditorFea = options.getEditorFeatureFlags) === null || _options$getEditorFea === void 0 ? void 0 : _options$getEditorFea.call(options).tableWithFixedColumnWidthsOption) || false;
-  var shouldUseIncreasedScalingPercent = options === null || options === void 0 ? void 0 : options.isTableScalingEnabled;
-  isTableFixedColumnWidthsOptionEnabled && (0, _platformFeatureFlags.getBooleanFF)('platform.editor.table.use-increased-scaling-percent');
+  var shouldUseIncreasedScalingPercent = (options === null || options === void 0 ? void 0 : options.isTableScalingEnabled) && isTableFixedColumnWidthsOptionEnabled && (0, _platformFeatureFlags.getBooleanFF)('platform.editor.table.use-increased-scaling-percent');
   var isCellBackgroundDuplicated = (options === null || options === void 0 || (_options$getEditorFea2 = options.getEditorFeatureFlags) === null || _options$getEditorFea2 === void 0 ? void 0 : _options$getEditorFea2.call(options).tableDuplicateCellColouring) || false;
   return {
     name: 'table',

package/dist/es2019/nodeviews/TableComponent.js

@@ -5,6 +5,7 @@ import memoizeOne from 'memoize-one';
 import rafSchedule from 'raf-schd';
 import { injectIntl } from 'react-intl-next';
 import { ACTION_SUBJECT, EVENT_TYPE, TABLE_ACTION } from '@atlaskit/editor-common/analytics';
+import { tintDirtyTransaction } from '@atlaskit/editor-common/collab';
 import { getParentNodeWidth, getTableContainerWidth } from '@atlaskit/editor-common/node-width';
 import { tableMarginSides } from '@atlaskit/editor-common/styles';
 import { browser, isValidPosition } from '@atlaskit/editor-common/utils';
@@ -148,7 +149,7 @@ class TableComponent extends React.Component {
         if (shouldScaleTable) {
           this.scaleTable({
             parentWidth
-          });
+          }, hasNumberedColumnChanged);
         }
 
         // only when table resizing is enabled and toggle numbered column to run scaleTable
@@ -156,7 +157,7 @@ class TableComponent extends React.Component {
           if (!hasTableBeenResized(prevNode)) {
             this.scaleTable({
               parentWidth: node.attrs.width
-            });
+            }, true);
           }
         }
         this.updateParentWidth(parentWidth);
@@ -166,7 +167,7 @@ class TableComponent extends React.Component {
       this.layoutSize = layoutSize;
     });
     // Function gets called when table is nested.
-    _defineProperty(this, "scaleTable", scaleOptions => {
+    _defineProperty(this, "scaleTable", (scaleOptions, isUserTriggered = false) => {
       const {
         view,
         getNode,
@@ -200,6 +201,9 @@ class TableComponent extends React.Component {
       // isTableScalingEnabled doesn't change the behavior of nested tables
       false // shouldUseIncreasedScalingPercent set to false for nested tables
       )(state.tr);
+      if (!isUserTriggered) {
+        tintDirtyTransaction(tr);
+      }
       dispatch(tr);
     });
     _defineProperty(this, "setTimerToSendInitialOverflowCaptured", isOverflowing => {

package/dist/es2019/plugin.js

@@ -62,8 +62,7 @@ const tablesPlugin = ({
   };
   const editorAnalyticsAPI = api === null || api === void 0 ? void 0 : (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions;
   const isTableFixedColumnWidthsOptionEnabled = (options === null || options === void 0 ? void 0 : (_options$getEditorFea = options.getEditorFeatureFlags) === null || _options$getEditorFea === void 0 ? void 0 : _options$getEditorFea.call(options).tableWithFixedColumnWidthsOption) || false;
-  const shouldUseIncreasedScalingPercent = options === null || options === void 0 ? void 0 : options.isTableScalingEnabled;
-  isTableFixedColumnWidthsOptionEnabled && getBooleanFF('platform.editor.table.use-increased-scaling-percent');
+  const shouldUseIncreasedScalingPercent = (options === null || options === void 0 ? void 0 : options.isTableScalingEnabled) && isTableFixedColumnWidthsOptionEnabled && getBooleanFF('platform.editor.table.use-increased-scaling-percent');
   const isCellBackgroundDuplicated = (options === null || options === void 0 ? void 0 : (_options$getEditorFea2 = options.getEditorFeatureFlags) === null || _options$getEditorFea2 === void 0 ? void 0 : _options$getEditorFea2.call(options).tableDuplicateCellColouring) || false;
   return {
     name: 'table',

package/dist/esm/nodeviews/TableComponent.js

@@ -19,6 +19,7 @@ import memoizeOne from 'memoize-one';
 import rafSchedule from 'raf-schd';
 import { injectIntl } from 'react-intl-next';
 import { ACTION_SUBJECT, EVENT_TYPE, TABLE_ACTION } from '@atlaskit/editor-common/analytics';
+import { tintDirtyTransaction } from '@atlaskit/editor-common/collab';
 import { getParentNodeWidth, getTableContainerWidth } from '@atlaskit/editor-common/node-width';
 import { tableMarginSides } from '@atlaskit/editor-common/styles';
 import { browser, isValidPosition } from '@atlaskit/editor-common/utils';
@@ -157,7 +158,7 @@ var TableComponent = /*#__PURE__*/function (_React$Component) {
         if (shouldScaleTable) {
           _this.scaleTable({
             parentWidth: parentWidth
-          });
+          }, hasNumberedColumnChanged);
         }
 
         // only when table resizing is enabled and toggle numbered column to run scaleTable
@@ -165,7 +166,7 @@ var TableComponent = /*#__PURE__*/function (_React$Component) {
           if (!hasTableBeenResized(prevNode)) {
             _this.scaleTable({
               parentWidth: node.attrs.width
-            });
+            }, true);
           }
         }
         _this.updateParentWidth(parentWidth);
@@ -176,6 +177,7 @@ var TableComponent = /*#__PURE__*/function (_React$Component) {
     });
     // Function gets called when table is nested.
     _defineProperty(_assertThisInitialized(_this), "scaleTable", function (scaleOptions) {
+      var isUserTriggered = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
       var _this$props2 = _this.props,
         view = _this$props2.view,
         getNode = _this$props2.getNode,
@@ -202,6 +204,9 @@ var TableComponent = /*#__PURE__*/function (_React$Component) {
       // isTableScalingEnabled doesn't change the behavior of nested tables
       false // shouldUseIncreasedScalingPercent set to false for nested tables
       )(state.tr);
+      if (!isUserTriggered) {
+        tintDirtyTransaction(tr);
+      }
       dispatch(tr);
     });
     _defineProperty(_assertThisInitialized(_this), "setTimerToSendInitialOverflowCaptured", function (isOverflowing) {

package/dist/esm/plugin.js

@@ -66,8 +66,7 @@ var tablesPlugin = function tablesPlugin(_ref) {
   };
   var editorAnalyticsAPI = api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions;
   var isTableFixedColumnWidthsOptionEnabled = (options === null || options === void 0 || (_options$getEditorFea = options.getEditorFeatureFlags) === null || _options$getEditorFea === void 0 ? void 0 : _options$getEditorFea.call(options).tableWithFixedColumnWidthsOption) || false;
-  var shouldUseIncreasedScalingPercent = options === null || options === void 0 ? void 0 : options.isTableScalingEnabled;
-  isTableFixedColumnWidthsOptionEnabled && getBooleanFF('platform.editor.table.use-increased-scaling-percent');
+  var shouldUseIncreasedScalingPercent = (options === null || options === void 0 ? void 0 : options.isTableScalingEnabled) && isTableFixedColumnWidthsOptionEnabled && getBooleanFF('platform.editor.table.use-increased-scaling-percent');
   var isCellBackgroundDuplicated = (options === null || options === void 0 || (_options$getEditorFea2 = options.getEditorFeatureFlags) === null || _options$getEditorFea2 === void 0 ? void 0 : _options$getEditorFea2.call(options).tableDuplicateCellColouring) || false;
   return {
     name: 'table',

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-table",
-	"version": "7.19.1",
+	"version": "7.19.3",
 	"description": "Table plugin for the @atlaskit/editor",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -31,7 +31,7 @@
 		"@atlaskit/adf-schema": "^38.0.0",
 		"@atlaskit/button": "^18.0.0",
 		"@atlaskit/custom-steps": "^0.4.0",
-		"@atlaskit/editor-common": "^83.3.0",
+		"@atlaskit/editor-common": "^83.4.0",
 		"@atlaskit/editor-palette": "1.6.0",
 		"@atlaskit/editor-plugin-accessibility-utils": "^1.1.0",
 		"@atlaskit/editor-plugin-analytics": "^1.4.0",
@@ -44,7 +44,7 @@
 		"@atlaskit/editor-shared-styles": "^2.12.0",
 		"@atlaskit/editor-tables": "^2.7.0",
 		"@atlaskit/icon": "^22.5.0",
-		"@atlaskit/menu": "^2.5.0",
+		"@atlaskit/menu": "^2.6.0",
 		"@atlaskit/platform-feature-flags": "^0.2.1",
 		"@atlaskit/pragmatic-drag-and-drop": "^1.1.0",
 		"@atlaskit/pragmatic-drag-and-drop-auto-scroll": "^1.3.0",

package/src/nodeviews/TableComponent.tsx

@@ -10,6 +10,7 @@ import { injectIntl } from 'react-intl-next';
 import type { TableColumnOrdering } from '@atlaskit/custom-steps';
 import { ACTION_SUBJECT, EVENT_TYPE, TABLE_ACTION } from '@atlaskit/editor-common/analytics';
 import type { DispatchAnalyticsEvent } from '@atlaskit/editor-common/analytics';
+import { tintDirtyTransaction } from '@atlaskit/editor-common/collab';
 import type { EventDispatcher } from '@atlaskit/editor-common/event-dispatcher';
 import { getParentNodeWidth, getTableContainerWidth } from '@atlaskit/editor-common/node-width';
 import { tableMarginSides } from '@atlaskit/editor-common/styles';
@@ -966,17 +967,23 @@ class TableComponent extends React.Component<ComponentProps, TableState> {
 
 			// If column has been inserted/deleted avoid multi dispatch
 			if (shouldScaleTable) {
-				this.scaleTable({
-					parentWidth,
-				});
+				this.scaleTable(
+					{
+						parentWidth,
+					},
+					hasNumberedColumnChanged,
+				);
 			}
 
 			// only when table resizing is enabled and toggle numbered column to run scaleTable
 			if (options?.isTableResizingEnabled && hasNumberedColumnChanged) {
 				if (!hasTableBeenResized(prevNode)) {
-					this.scaleTable({
-						parentWidth: node.attrs.width,
-					});
+					this.scaleTable(
+						{
+							parentWidth: node.attrs.width,
+						},
+						true,
+					);
 				}
 			}
 
@@ -989,7 +996,7 @@ class TableComponent extends React.Component<ComponentProps, TableState> {
 	};
 
 	// Function gets called when table is nested.
-	private scaleTable = (scaleOptions: { parentWidth?: number }) => {
+	private scaleTable = (scaleOptions: { parentWidth?: number }, isUserTriggered = false) => {
 		const { view, getNode, getPos, containerWidth, options } = this.props;
 		const node = getNode();
 		const { state, dispatch } = view;
@@ -1019,6 +1026,10 @@ class TableComponent extends React.Component<ComponentProps, TableState> {
 			false, // shouldUseIncreasedScalingPercent set to false for nested tables
 		)(state.tr);
 
+		if (!isUserTriggered) {
+			tintDirtyTransaction(tr);
+		}
+
 		dispatch(tr);
 	};
 

package/src/plugin.tsx

@@ -158,8 +158,9 @@ const tablesPlugin: TablePlugin = ({ config: options, api }) => {
 
 	const isTableFixedColumnWidthsOptionEnabled =
 		options?.getEditorFeatureFlags?.().tableWithFixedColumnWidthsOption || false;
-	const shouldUseIncreasedScalingPercent = options?.isTableScalingEnabled;
-	isTableFixedColumnWidthsOptionEnabled &&
+	const shouldUseIncreasedScalingPercent =
+		options?.isTableScalingEnabled &&
+		isTableFixedColumnWidthsOptionEnabled &&
 		getBooleanFF('platform.editor.table.use-increased-scaling-percent');
 
 	const isCellBackgroundDuplicated =