@atlaskit/renderer 120.2.7 → 120.3.0

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @atlaskit/renderer
 
+## 120.3.0
+
+### Minor Changes
+
+- [#190691](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/190691)
+  [`e4343163813c4`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/e4343163813c4) -
+  [ux] [JRACLOUD-95277] When numbered column is on, use percentage scaling for colWidths if the
+  tableWidth is less than the maxWidth and the column width is greater than the min colWidth
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 120.2.7
 
 ### Patch Changes

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

@@ -14,6 +14,7 @@ var _nodeWidth = require("@atlaskit/editor-common/node-width");
 var _useFeatureFlags = require("../../../use-feature-flags");
 var _rendererContext = require("../../../renderer-context");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
+var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 // we allow scaling down column widths by no more than 30%
@@ -174,6 +175,35 @@ var renderScaleDownColgroup = function renderScaleDownColgroup(props) {
       isNumberColumnEnabled: isNumberColumnEnabled
     });
   }
+  if (isNumberColumnEnabled && (tableWidth < maxTableWidth || maxTableWidth === 0) && (0, _expValEquals.expValEquals)('editor_prevent_numbered_column_too_big_jira', 'isEnabled', true)) {
+    var fixedColWidths = targetWidths.map(function (width) {
+      return fixColumnWidth(width, tableWidth, maxTableWidth, zeroWidthColumnsCount, scaleDownPercent) || cellMinWidth;
+    });
+    var sumFixedColumnWidths = colWidthSum(fixedColWidths);
+    return fixedColWidths.map(function (colWidth) {
+      var width = Math.max(colWidth, cellMinWidth);
+      if (colWidth > _editorSharedStyles.akEditorTableCellMinWidth) {
+        // To make sure the numbered column isn't scaled, use
+        // percentages for the other columns.
+        // Calculate the percentage based on the sum of the fixed column widths
+        return {
+          width: "".concat(width / sumFixedColumnWidths * 100, "%")
+        };
+      } else {
+        // If the column is equal to or less than the minimum cell width, we need to return a fixed pixel width.
+        // This is to prevent columns being scaled below the minimum cell width.
+        var style = width ? {
+          width: "".concat(width, "px")
+        } : {};
+        return style;
+      }
+    });
+  }
+
+  /**
+   * When cleaning up editor_prevent_numbered_column_too_big_jira experiment,
+   * resuse the fixedColWidths const to avoid code duplication.
+   */
   return targetWidths.map(function (colWidth) {
     var width = fixColumnWidth(colWidth, minTableWidth, maxTableWidth, zeroWidthColumnsCount, scaleDownPercent) || cellMinWidth;
     var style = width ? {

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

@@ -63,7 +63,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 var NORMAL_SEVERITY_THRESHOLD = exports.NORMAL_SEVERITY_THRESHOLD = 2000;
 var DEGRADED_SEVERITY_THRESHOLD = exports.DEGRADED_SEVERITY_THRESHOLD = 3000;
 var packageName = "@atlaskit/renderer";
-var packageVersion = "120.2.6";
+var packageVersion = "120.2.7";
 var setAsQueryContainerStyles = (0, _react2.css)({
   containerName: 'ak-renderer-wrapper',
   containerType: 'inline-size'

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

@@ -1,11 +1,12 @@
 import React from 'react';
 import { tableCellBorderWidth, tableCellMinWidth } from '@atlaskit/editor-common/styles';
-import { akEditorTableNumberColumnWidth, akEditorTableLegacyCellMinWidth } from '@atlaskit/editor-shared-styles';
+import { akEditorTableNumberColumnWidth, akEditorTableLegacyCellMinWidth, akEditorTableCellMinWidth } from '@atlaskit/editor-shared-styles';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { getTableContainerWidth } from '@atlaskit/editor-common/node-width';
 import { useFeatureFlags } from '../../../use-feature-flags';
 import { useRendererContext } from '../../../renderer-context';
 import { fg } from '@atlaskit/platform-feature-flags';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 
 // we allow scaling down column widths by no more than 30%
 // this intends to reduce unwanted scrolling in the Renderer in these scenarios:
@@ -160,6 +161,33 @@ const renderScaleDownColgroup = props => {
       isNumberColumnEnabled: isNumberColumnEnabled
     });
   }
+  if (isNumberColumnEnabled && (tableWidth < maxTableWidth || maxTableWidth === 0) && expValEquals('editor_prevent_numbered_column_too_big_jira', 'isEnabled', true)) {
+    const fixedColWidths = targetWidths.map(width => fixColumnWidth(width, tableWidth, maxTableWidth, zeroWidthColumnsCount, scaleDownPercent) || cellMinWidth);
+    const sumFixedColumnWidths = colWidthSum(fixedColWidths);
+    return fixedColWidths.map(colWidth => {
+      const width = Math.max(colWidth, cellMinWidth);
+      if (colWidth > akEditorTableCellMinWidth) {
+        // To make sure the numbered column isn't scaled, use
+        // percentages for the other columns.
+        // Calculate the percentage based on the sum of the fixed column widths
+        return {
+          width: `${width / sumFixedColumnWidths * 100}%`
+        };
+      } else {
+        // If the column is equal to or less than the minimum cell width, we need to return a fixed pixel width.
+        // This is to prevent columns being scaled below the minimum cell width.
+        const style = width ? {
+          width: `${width}px`
+        } : {};
+        return style;
+      }
+    });
+  }
+
+  /**
+   * When cleaning up editor_prevent_numbered_column_too_big_jira experiment,
+   * resuse the fixedColWidths const to avoid code duplication.
+   */
   return targetWidths.map(colWidth => {
     const width = fixColumnWidth(colWidth, minTableWidth, maxTableWidth, zeroWidthColumnsCount, scaleDownPercent) || cellMinWidth;
     const style = width ? {

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

@@ -49,7 +49,7 @@ import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equ
 export const NORMAL_SEVERITY_THRESHOLD = 2000;
 export const DEGRADED_SEVERITY_THRESHOLD = 3000;
 const packageName = "@atlaskit/renderer";
-const packageVersion = "120.2.6";
+const packageVersion = "120.2.7";
 const setAsQueryContainerStyles = css({
   containerName: 'ak-renderer-wrapper',
   containerType: 'inline-size'

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

@@ -3,12 +3,13 @@ function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbol
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 import React from 'react';
 import { tableCellBorderWidth, tableCellMinWidth } from '@atlaskit/editor-common/styles';
-import { akEditorTableNumberColumnWidth, akEditorTableLegacyCellMinWidth } from '@atlaskit/editor-shared-styles';
+import { akEditorTableNumberColumnWidth, akEditorTableLegacyCellMinWidth, akEditorTableCellMinWidth } from '@atlaskit/editor-shared-styles';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { getTableContainerWidth } from '@atlaskit/editor-common/node-width';
 import { useFeatureFlags } from '../../../use-feature-flags';
 import { useRendererContext } from '../../../renderer-context';
 import { fg } from '@atlaskit/platform-feature-flags';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 
 // we allow scaling down column widths by no more than 30%
 // this intends to reduce unwanted scrolling in the Renderer in these scenarios:
@@ -168,6 +169,35 @@ var renderScaleDownColgroup = function renderScaleDownColgroup(props) {
       isNumberColumnEnabled: isNumberColumnEnabled
     });
   }
+  if (isNumberColumnEnabled && (tableWidth < maxTableWidth || maxTableWidth === 0) && expValEquals('editor_prevent_numbered_column_too_big_jira', 'isEnabled', true)) {
+    var fixedColWidths = targetWidths.map(function (width) {
+      return fixColumnWidth(width, tableWidth, maxTableWidth, zeroWidthColumnsCount, scaleDownPercent) || cellMinWidth;
+    });
+    var sumFixedColumnWidths = colWidthSum(fixedColWidths);
+    return fixedColWidths.map(function (colWidth) {
+      var width = Math.max(colWidth, cellMinWidth);
+      if (colWidth > akEditorTableCellMinWidth) {
+        // To make sure the numbered column isn't scaled, use
+        // percentages for the other columns.
+        // Calculate the percentage based on the sum of the fixed column widths
+        return {
+          width: "".concat(width / sumFixedColumnWidths * 100, "%")
+        };
+      } else {
+        // If the column is equal to or less than the minimum cell width, we need to return a fixed pixel width.
+        // This is to prevent columns being scaled below the minimum cell width.
+        var style = width ? {
+          width: "".concat(width, "px")
+        } : {};
+        return style;
+      }
+    });
+  }
+
+  /**
+   * When cleaning up editor_prevent_numbered_column_too_big_jira experiment,
+   * resuse the fixedColWidths const to avoid code duplication.
+   */
   return targetWidths.map(function (colWidth) {
     var width = fixColumnWidth(colWidth, minTableWidth, maxTableWidth, zeroWidthColumnsCount, scaleDownPercent) || cellMinWidth;
     var style = width ? {

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

@@ -54,7 +54,7 @@ import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equ
 export var NORMAL_SEVERITY_THRESHOLD = 2000;
 export var DEGRADED_SEVERITY_THRESHOLD = 3000;
 var packageName = "@atlaskit/renderer";
-var packageVersion = "120.2.6";
+var packageVersion = "120.2.7";
 var setAsQueryContainerStyles = css({
   containerName: 'ak-renderer-wrapper',
   containerType: 'inline-size'

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/renderer",
-	"version": "120.2.7",
+	"version": "120.3.0",
 	"description": "Renderer component",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -28,7 +28,7 @@
 		"@atlaskit/analytics-listeners": "^9.0.0",
 		"@atlaskit/analytics-namespaced-context": "^7.0.0",
 		"@atlaskit/analytics-next": "^11.1.0",
-		"@atlaskit/button": "^23.2.0",
+		"@atlaskit/button": "^23.3.0",
 		"@atlaskit/code": "^17.2.0",
 		"@atlaskit/editor-json-transformer": "^8.24.0",
 		"@atlaskit/editor-palette": "^2.1.0",
@@ -54,7 +54,7 @@
 		"@atlaskit/status": "^3.0.0",
 		"@atlaskit/task-decision": "^19.2.0",
 		"@atlaskit/theme": "^19.0.0",
-		"@atlaskit/tmp-editor-statsig": "^9.14.0",
+		"@atlaskit/tmp-editor-statsig": "^9.15.0",
 		"@atlaskit/tokens": "^5.6.0",
 		"@atlaskit/tooltip": "^20.3.0",
 		"@atlaskit/visually-hidden": "^3.0.0",