@atlaskit/renderer 109.40.10 → 109.40.11

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @atlaskit/renderer
 
+## 109.40.11
+
+### Patch Changes
+
+- [#118361](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/118361)
+  [`5dc690bcdd97a`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/5dc690bcdd97a) -
+  Table FF cleanup
+- Updated dependencies
+
 ## 109.40.10
 
 ### Patch Changes

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

@@ -318,7 +318,7 @@ var TableContainer = exports.TableContainer = /*#__PURE__*/function (_React$Comp
       var tableWidth = calcDefaultLayoutWidthByAppearance(rendererAppearance, tableNode);
 
       // Logic for table alignment in renderer
-      var isTableAlignStart = (0, _platformFeatureFlags.getBooleanFF)('platform.editor.table.allow-table-alignment') && (0, _appearance.isFullWidthOrFullPageAppearance)(rendererAppearance) && tableNode && tableNode.attrs && tableNode.attrs.layout === 'align-start';
+      var isTableAlignStart = (0, _appearance.isFullWidthOrFullPageAppearance)(rendererAppearance) && tableNode && tableNode.attrs && tableNode.attrs.layout === 'align-start' && (0, _platformFeatureFlags.fg)('platform.editor.table.allow-table-alignment');
       var fullWidthLineLength = isRenderWidthValid ? Math.min(_editorSharedStyles.akEditorFullWidthLayoutWidth, renderWidth) : _editorSharedStyles.akEditorFullWidthLayoutWidth;
       var lineLength = (0, _appearance.isFullWidthAppearance)(rendererAppearance) ? fullWidthLineLength : lineLengthFixedWidth;
       var shouldCalculateLeftForAlignment = isTableAlignStart && ((0, _appearance.isFullPageAppearance)(rendererAppearance) && tableWidth <= lineLengthFixedWidth || (0, _appearance.isFullWidthAppearance)(rendererAppearance));
@@ -456,8 +456,7 @@ var TableWithWidth = function TableWithWidth(props) {
   return /*#__PURE__*/_react.default.createElement(_ui.WidthConsumer, null, function (_ref2) {
     var _props$columnWidths;
     var width = _ref2.width;
-    // we are adding full page padding before but now it cause difference between editor and renderer so we need to remove it, and 1px also for matching exact width.
-    var renderWidth = props.rendererAppearance === 'full-page' ? (0, _platformFeatureFlags.getBooleanFF)('platform.editor.table-width-diff-in-renderer_x5s3z') ? width + _style.FullPagePadding - 1 : width - _style.FullPagePadding * 2 : width;
+    var renderWidth = props.rendererAppearance === 'full-page' ? width - _style.FullPagePadding * 2 : width;
     var colWidthsSum = ((_props$columnWidths = props.columnWidths) === null || _props$columnWidths === void 0 ? void 0 : _props$columnWidths.reduce(function (total, val) {
       return total + val;
     }, 0)) || 0;

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.40.10";
+var packageVersion = "109.40.11";
 var defaultNodeComponents = exports.defaultNodeComponents = _nodes.nodeToReact;
 var Renderer = exports.Renderer = /*#__PURE__*/function (_PureComponent) {
   (0, _inherits2.default)(Renderer, _PureComponent);

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

@@ -7,7 +7,7 @@ import { createCompareNodes, convertProsemirrorTableNodeToArrayOfRows, hasMerged
 import { SortOrder } from '@atlaskit/editor-common/types';
 import { akEditorDefaultLayoutWidth, akEditorFullWidthLayoutWidth } from '@atlaskit/editor-shared-styles';
 import { getTableContainerWidth } from '@atlaskit/editor-common/node-width';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { FullPagePadding } from '../../ui/Renderer/style';
 import { TableHeader } from './tableCell';
 import { withSmartCardStorage } from '../../ui/SmartCardStorage';
@@ -265,7 +265,7 @@ export class TableContainer extends React.Component {
     const tableWidth = calcDefaultLayoutWidthByAppearance(rendererAppearance, tableNode);
 
     // Logic for table alignment in renderer
-    const isTableAlignStart = getBooleanFF('platform.editor.table.allow-table-alignment') && isFullWidthOrFullPageAppearance(rendererAppearance) && tableNode && tableNode.attrs && tableNode.attrs.layout === 'align-start';
+    const isTableAlignStart = isFullWidthOrFullPageAppearance(rendererAppearance) && tableNode && tableNode.attrs && tableNode.attrs.layout === 'align-start' && fg('platform.editor.table.allow-table-alignment');
     const fullWidthLineLength = isRenderWidthValid ? Math.min(akEditorFullWidthLayoutWidth, renderWidth) : akEditorFullWidthLayoutWidth;
     const lineLength = isFullWidthAppearance(rendererAppearance) ? fullWidthLineLength : lineLengthFixedWidth;
     const shouldCalculateLeftForAlignment = isTableAlignStart && (isFullPageAppearance(rendererAppearance) && tableWidth <= lineLengthFixedWidth || isFullWidthAppearance(rendererAppearance));
@@ -397,8 +397,7 @@ const TableWithWidth = props => {
     width
   }) => {
     var _props$columnWidths;
-    // we are adding full page padding before but now it cause difference between editor and renderer so we need to remove it, and 1px also for matching exact width.
-    const renderWidth = props.rendererAppearance === 'full-page' ? getBooleanFF('platform.editor.table-width-diff-in-renderer_x5s3z') ? width + FullPagePadding - 1 : width - FullPagePadding * 2 : width;
+    const renderWidth = props.rendererAppearance === 'full-page' ? width - FullPagePadding * 2 : width;
     const colWidthsSum = ((_props$columnWidths = props.columnWidths) === null || _props$columnWidths === void 0 ? void 0 : _props$columnWidths.reduce((total, val) => total + val, 0)) || 0;
     if (colWidthsSum || isTableResizingEnabled(props.rendererAppearance)) {
       return /*#__PURE__*/React.createElement(TableWithShadows, _extends({

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

@@ -38,7 +38,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.40.10";
+const packageVersion = "109.40.11";
 export const defaultNodeComponents = nodeToReact;
 export class Renderer extends PureComponent {
   constructor(props) {

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

@@ -18,7 +18,7 @@ import { createCompareNodes, convertProsemirrorTableNodeToArrayOfRows, hasMerged
 import { SortOrder } from '@atlaskit/editor-common/types';
 import { akEditorDefaultLayoutWidth, akEditorFullWidthLayoutWidth } from '@atlaskit/editor-shared-styles';
 import { getTableContainerWidth } from '@atlaskit/editor-common/node-width';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { FullPagePadding } from '../../ui/Renderer/style';
 import { TableHeader } from './tableCell';
 import { withSmartCardStorage } from '../../ui/SmartCardStorage';
@@ -311,7 +311,7 @@ export var TableContainer = /*#__PURE__*/function (_React$Component) {
       var tableWidth = calcDefaultLayoutWidthByAppearance(rendererAppearance, tableNode);
 
       // Logic for table alignment in renderer
-      var isTableAlignStart = getBooleanFF('platform.editor.table.allow-table-alignment') && isFullWidthOrFullPageAppearance(rendererAppearance) && tableNode && tableNode.attrs && tableNode.attrs.layout === 'align-start';
+      var isTableAlignStart = isFullWidthOrFullPageAppearance(rendererAppearance) && tableNode && tableNode.attrs && tableNode.attrs.layout === 'align-start' && fg('platform.editor.table.allow-table-alignment');
       var fullWidthLineLength = isRenderWidthValid ? Math.min(akEditorFullWidthLayoutWidth, renderWidth) : akEditorFullWidthLayoutWidth;
       var lineLength = isFullWidthAppearance(rendererAppearance) ? fullWidthLineLength : lineLengthFixedWidth;
       var shouldCalculateLeftForAlignment = isTableAlignStart && (isFullPageAppearance(rendererAppearance) && tableWidth <= lineLengthFixedWidth || isFullWidthAppearance(rendererAppearance));
@@ -449,8 +449,7 @@ var TableWithWidth = function TableWithWidth(props) {
   return /*#__PURE__*/React.createElement(WidthConsumer, null, function (_ref2) {
     var _props$columnWidths;
     var width = _ref2.width;
-    // we are adding full page padding before but now it cause difference between editor and renderer so we need to remove it, and 1px also for matching exact width.
-    var renderWidth = props.rendererAppearance === 'full-page' ? getBooleanFF('platform.editor.table-width-diff-in-renderer_x5s3z') ? width + FullPagePadding - 1 : width - FullPagePadding * 2 : width;
+    var renderWidth = props.rendererAppearance === 'full-page' ? width - FullPagePadding * 2 : width;
     var colWidthsSum = ((_props$columnWidths = props.columnWidths) === null || _props$columnWidths === void 0 ? void 0 : _props$columnWidths.reduce(function (total, val) {
       return total + val;
     }, 0)) || 0;

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

@@ -48,7 +48,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.40.10";
+var packageVersion = "109.40.11";
 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.40.10",
+	"version": "109.40.11",
 	"description": "Renderer component",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -29,7 +29,7 @@
 		"@atlaskit/analytics-listeners": "^8.10.0",
 		"@atlaskit/analytics-namespaced-context": "^6.10.0",
 		"@atlaskit/analytics-next": "^9.3.0",
-		"@atlaskit/button": "^18.2.0",
+		"@atlaskit/button": "^18.3.0",
 		"@atlaskit/code": "^15.4.0",
 		"@atlaskit/editor-common": "^84.3.0",
 		"@atlaskit/editor-json-transformer": "^8.15.0",
@@ -125,9 +125,6 @@
 		"platform.editor.inline_extension.extended_lcqdn": {
 			"type": "boolean"
 		},
-		"platform.editor.table-width-diff-in-renderer_x5s3z": {
-			"type": "boolean"
-		},
 		"platform_editor_tables_padding_increase": {
 			"type": "boolean"
 		},