@atlaskit/renderer 109.25.1 → 109.25.2

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @atlaskit/renderer
 
+## 109.25.2
+
+### Patch Changes
+
+-   [#97277](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/97277)
+    [`c54bc21684fc`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/c54bc21684fc) -
+    [ux] Table should not scale down when width is locked
+-   Updated dependencies
+
 ## 109.25.1
 
 ### Patch Changes

package/dist/cjs/react/nodes/table/colgroup.js

@@ -10,6 +10,7 @@ var _styles = require("@atlaskit/editor-common/styles");
 var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
 var _nodeWidth = require("@atlaskit/editor-common/node-width");
 var _table = require("../table");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 // we allow scaling down column widths by no more than 30%
 // this intends to reduce unwanted scrolling in the Renderer in these scenarios:
 // User A creates a table with column widths → User B views it on a smaller screen
@@ -43,6 +44,7 @@ var calcScalePercent = exports.calcScalePercent = function calcScalePercent(_ref
   return diffPercent < maxScale ? diffPercent : maxScale;
 };
 var renderScaleDownColgroup = function renderScaleDownColgroup(props) {
+  var _props$tableNode;
   var columnWidths = props.columnWidths,
     isNumberColumnEnabled = props.isNumberColumnEnabled,
     renderWidth = props.renderWidth,
@@ -83,6 +85,8 @@ var renderScaleDownColgroup = function renderScaleDownColgroup(props) {
   });
   var cellMinWidth = 0;
   var scaleDownPercent = 0;
+  var isTableWidthFixed = (0, _platformFeatureFlags.getBooleanFF)('platform.editor.table.preserve-widths-with-lock-button') && ((_props$tableNode = props.tableNode) === null || _props$tableNode === void 0 ? void 0 : _props$tableNode.attrs.displayMode) === 'fixed';
+
   // fixes migration tables with zero-width columns
   if (zeroWidthColumnsCount > 0) {
     if (minTableWidth > maxTableWidth) {
@@ -91,7 +95,7 @@ var renderScaleDownColgroup = function renderScaleDownColgroup(props) {
     }
   }
   // scaling down
-  else if (renderWidth < tableWidth) {
+  else if (renderWidth < tableWidth && !isTableWidthFixed) {
     scaleDownPercent = calcScalePercent({
       renderWidth: renderWidth,
       tableWidth: tableWidth,

package/dist/cjs/ui/Renderer/index.js

@@ -56,7 +56,7 @@ function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.
 var NORMAL_SEVERITY_THRESHOLD = exports.NORMAL_SEVERITY_THRESHOLD = 2000;
 var DEGRADED_SEVERITY_THRESHOLD = exports.DEGRADED_SEVERITY_THRESHOLD = 3000;
 var packageName = "@atlaskit/renderer";
-var packageVersion = "109.25.1";
+var packageVersion = "109.25.2";
 var defaultNodeComponents = exports.defaultNodeComponents = _nodes.nodeToReact;
 var Renderer = exports.Renderer = /*#__PURE__*/function (_PureComponent) {
   (0, _inherits2.default)(Renderer, _PureComponent);

package/dist/es2019/react/nodes/table/colgroup.js

@@ -3,6 +3,7 @@ import { tableCellBorderWidth, tableCellMinWidth } from '@atlaskit/editor-common
 import { akEditorTableNumberColumnWidth, akEditorTableLegacyCellMinWidth } from '@atlaskit/editor-shared-styles';
 import { getTableContainerWidth } from '@atlaskit/editor-common/node-width';
 import { isTableResizingEnabled } from '../table';
+import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 
 // we allow scaling down column widths by no more than 30%
 // this intends to reduce unwanted scrolling in the Renderer in these scenarios:
@@ -36,6 +37,7 @@ export const calcScalePercent = ({
   return diffPercent < maxScale ? diffPercent : maxScale;
 };
 const renderScaleDownColgroup = props => {
+  var _props$tableNode;
   let {
     columnWidths,
     isNumberColumnEnabled,
@@ -78,6 +80,8 @@ const renderScaleDownColgroup = props => {
   });
   let cellMinWidth = 0;
   let scaleDownPercent = 0;
+  const isTableWidthFixed = getBooleanFF('platform.editor.table.preserve-widths-with-lock-button') && ((_props$tableNode = props.tableNode) === null || _props$tableNode === void 0 ? void 0 : _props$tableNode.attrs.displayMode) === 'fixed';
+
   // fixes migration tables with zero-width columns
   if (zeroWidthColumnsCount > 0) {
     if (minTableWidth > maxTableWidth) {
@@ -86,7 +90,7 @@ const renderScaleDownColgroup = props => {
     }
   }
   // scaling down
-  else if (renderWidth < tableWidth) {
+  else if (renderWidth < tableWidth && !isTableWidthFixed) {
     scaleDownPercent = calcScalePercent({
       renderWidth,
       tableWidth,

package/dist/es2019/ui/Renderer/index.js

@@ -37,7 +37,7 @@ import { nodeToReact } from '../../react/nodes';
 export const NORMAL_SEVERITY_THRESHOLD = 2000;
 export const DEGRADED_SEVERITY_THRESHOLD = 3000;
 const packageName = "@atlaskit/renderer";
-const packageVersion = "109.25.1";
+const packageVersion = "109.25.2";
 export const defaultNodeComponents = nodeToReact;
 export class Renderer extends PureComponent {
   constructor(props) {

package/dist/esm/react/nodes/table/colgroup.js

@@ -3,6 +3,7 @@ import { tableCellBorderWidth, tableCellMinWidth } from '@atlaskit/editor-common
 import { akEditorTableNumberColumnWidth, akEditorTableLegacyCellMinWidth } from '@atlaskit/editor-shared-styles';
 import { getTableContainerWidth } from '@atlaskit/editor-common/node-width';
 import { isTableResizingEnabled } from '../table';
+import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 
 // we allow scaling down column widths by no more than 30%
 // this intends to reduce unwanted scrolling in the Renderer in these scenarios:
@@ -37,6 +38,7 @@ export var calcScalePercent = function calcScalePercent(_ref) {
   return diffPercent < maxScale ? diffPercent : maxScale;
 };
 var renderScaleDownColgroup = function renderScaleDownColgroup(props) {
+  var _props$tableNode;
   var columnWidths = props.columnWidths,
     isNumberColumnEnabled = props.isNumberColumnEnabled,
     renderWidth = props.renderWidth,
@@ -77,6 +79,8 @@ var renderScaleDownColgroup = function renderScaleDownColgroup(props) {
   });
   var cellMinWidth = 0;
   var scaleDownPercent = 0;
+  var isTableWidthFixed = getBooleanFF('platform.editor.table.preserve-widths-with-lock-button') && ((_props$tableNode = props.tableNode) === null || _props$tableNode === void 0 ? void 0 : _props$tableNode.attrs.displayMode) === 'fixed';
+
   // fixes migration tables with zero-width columns
   if (zeroWidthColumnsCount > 0) {
     if (minTableWidth > maxTableWidth) {
@@ -85,7 +89,7 @@ var renderScaleDownColgroup = function renderScaleDownColgroup(props) {
     }
   }
   // scaling down
-  else if (renderWidth < tableWidth) {
+  else if (renderWidth < tableWidth && !isTableWidthFixed) {
     scaleDownPercent = calcScalePercent({
       renderWidth: renderWidth,
       tableWidth: tableWidth,

package/dist/esm/ui/Renderer/index.js

@@ -47,7 +47,7 @@ import { nodeToReact } from '../../react/nodes';
 export var NORMAL_SEVERITY_THRESHOLD = 2000;
 export var DEGRADED_SEVERITY_THRESHOLD = 3000;
 var packageName = "@atlaskit/renderer";
-var packageVersion = "109.25.1";
+var packageVersion = "109.25.2";
 export var defaultNodeComponents = nodeToReact;
 export var Renderer = /*#__PURE__*/function (_PureComponent) {
   _inherits(Renderer, _PureComponent);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/renderer",
-  "version": "109.25.1",
+  "version": "109.25.2",
   "description": "Renderer component",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -25,14 +25,14 @@
   },
   "dependencies": {
     "@atlaskit/adf-schema": "^35.12.2",
-    "@atlaskit/adf-utils": "^19.0.0",
+    "@atlaskit/adf-utils": "^19.1.0",
     "@atlaskit/analytics-listeners": "^8.9.0",
     "@atlaskit/analytics-namespaced-context": "^6.9.0",
     "@atlaskit/analytics-next": "^9.3.0",
     "@atlaskit/button": "^17.14.0",
     "@atlaskit/code": "^15.1.0",
-    "@atlaskit/editor-common": "^79.1.0",
-    "@atlaskit/editor-json-transformer": "^8.11.0",
+    "@atlaskit/editor-common": "^79.2.0",
+    "@atlaskit/editor-json-transformer": "^8.12.0",
     "@atlaskit/editor-palette": "1.6.0",
     "@atlaskit/editor-prosemirror": "4.0.1",
     "@atlaskit/editor-shared-styles": "^2.10.0",
@@ -47,7 +47,7 @@
     "@atlaskit/media-ui": "^25.10.0",
     "@atlaskit/media-viewer": "^48.5.0",
     "@atlaskit/platform-feature-flags": "^0.2.0",
-    "@atlaskit/smart-card": "^26.60.0",
+    "@atlaskit/smart-card": "^26.62.0",
     "@atlaskit/status": "^1.4.0",
     "@atlaskit/task-decision": "^17.10.0",
     "@atlaskit/theme": "^12.7.0",
@@ -137,6 +137,9 @@
     },
     "platform.editor.renderer-error-boundary-for-dom-errors": {
       "type": "boolean"
+    },
+    "platform.editor.table.preserve-widths-with-lock-button": {
+      "type": "boolean"
     }
   },
   "af:exports": {