@atlaskit/editor-common 96.5.4 → 96.5.6

package/CHANGELOG.md

@@ -1,5 +1,24 @@
 # @atlaskit/editor-common
 
+## 96.5.6
+
+### Patch Changes
+
+- [#180440](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/180440)
+  [`054eb933bb538`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/054eb933bb538) -
+  Add platform_editor_table_row_span_fix FG, which will scan the entire table to determine how many
+  columns it has instead of relying on the first row. This fixes a bug where a table is not
+  'resized' and has merged cells in the first row, and will return the wrong number of columns.
+
+## 96.5.5
+
+### Patch Changes
+
+- [#179495](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/179495)
+  [`5df4aaaa16713`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/5df4aaaa16713) -
+  [ux] Fixed resizing issue when layout is stacked on a narrow screen and resizer item gets
+  min-width bigger than max-width.
+
 ## 96.5.4
 
 ### Patch Changes

package/dist/cjs/monitoring/error.js

@@ -17,7 +17,7 @@ function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 var SENTRY_DSN = 'https://0b10c8e02fb44d8796c047b102c9bee8@o55978.ingest.sentry.io/4505129224110080';
 var packageName = 'editor-common'; // Sentry doesn't accept '/' in its releases https://docs.sentry.io/platforms/javascript/configuration/releases/
-var packageVersion = "96.5.4";
+var packageVersion = "96.5.6";
 var sanitiseSentryEvents = function sanitiseSentryEvents(data, _hint) {
   // Remove URL as it has UGC
   // TODO: Sanitise the URL instead of just removing it

package/dist/cjs/resizer/BreakoutResizer.js

@@ -9,6 +9,7 @@ exports.ignoreResizerMutations = exports.BreakoutResizer = void 0;
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = _interopRequireWildcard(require("react"));
 var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _analytics = require("../analytics");
 var _styles = require("../styles");
@@ -47,7 +48,17 @@ var getHandleStyle = function getHandleStyle(node) {
   }
 };
 var ignoreResizerMutations = exports.ignoreResizerMutations = function ignoreResizerMutations(mutation) {
-  return mutation.target.classList.contains('resizer-item') || mutation.type === 'attributes' && mutation.attributeName === 'style';
+  if ((0, _platformFeatureFlags.fg)('platform_editor_breakoutresizer_remove_assertion')) {
+    if (mutation.target instanceof Element) {
+      return mutation.target.classList.contains('resizer-item') || mutation.type === 'attributes' && mutation.attributeName === 'style';
+    }
+    return mutation.type === 'attributes' && mutation.attributeName === 'style';
+  } else {
+    return (
+      // eslint-disable-next-line @atlaskit/editor/no-as-casting
+      mutation.target.classList.contains('resizer-item') || mutation.type === 'attributes' && mutation.attributeName === 'style'
+    );
+  }
 };
 var resizingStyles = {
   left: '50%',
@@ -113,8 +124,12 @@ var BreakoutResizer = exports.BreakoutResizer = function BreakoutResizer(_ref) {
       state = editorView.state;
     displayGapCursor(false);
     if (widthState !== undefined && widthState.lineLength !== undefined && widthState.width !== undefined) {
-      newMinWidth = Math.min(widthState.lineLength, _editorSharedStyles.akEditorDefaultLayoutWidth);
       newMaxWidth = Math.min(widthState.width - (0, _editorSharedStyles.akEditorGutterPaddingDynamic)() * 2 - _editorSharedStyles.akEditorGutterPadding, _editorSharedStyles.akEditorFullWidthLayoutWidth);
+      if ((0, _platformFeatureFlags.fg)('platform_editor_advanced_layouts_post_fix_patch_2')) {
+        newMinWidth = Math.min(widthState.lineLength, _editorSharedStyles.akEditorDefaultLayoutWidth, newMaxWidth);
+      } else {
+        newMinWidth = Math.min(widthState.lineLength, _editorSharedStyles.akEditorDefaultLayoutWidth);
+      }
     }
     setResizingState({
       isResizing: true,

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

@@ -23,7 +23,7 @@ function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.
  * @jsx jsx
  */ // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 var packageName = "@atlaskit/editor-common";
-var packageVersion = "96.5.4";
+var packageVersion = "96.5.6";
 var halfFocusRing = 1;
 var dropOffset = '0, 8';
 var DropList = /*#__PURE__*/function (_Component) {

package/dist/cjs/utils/table.js

@@ -9,7 +9,30 @@ exports.convertProsemirrorTableNodeToArrayOfRows = convertProsemirrorTableNodeTo
 exports.hasMergedCell = hasMergedCell;
 exports.isPositionNearTableRow = isPositionNearTableRow;
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 function calcTableColumnWidths(node) {
+  if ((0, _platformFeatureFlags.fg)('platform_editor_table_row_span_fix')) {
+    var _firstRow = node.firstChild;
+    var _tableColumnWidths = [];
+    if (_firstRow) {
+      _firstRow.forEach(function (cell) {
+        var _cell$attrs = cell.attrs,
+          colspan = _cell$attrs.colspan,
+          colwidth = _cell$attrs.colwidth;
+        // column has been resized, colWidth will be an array, can safely take values even if cell is merged
+        if (Array.isArray(colwidth)) {
+          _tableColumnWidths.push.apply(_tableColumnWidths, (0, _toConsumableArray2.default)(colwidth));
+          // table has merged cells but no colWidth, so columns haven't been resized, default to 0
+        } else if (colspan > 1) {
+          _tableColumnWidths.push.apply(_tableColumnWidths, (0, _toConsumableArray2.default)(Array(colspan).fill(0)));
+          // no merged cells, no column resized, default to 0
+        } else {
+          _tableColumnWidths.push(0);
+        }
+      });
+    }
+    return _tableColumnWidths;
+  }
   var tableColumnWidths = [];
   var firstRow = node.firstChild;
   if (firstRow) {

package/dist/es2019/monitoring/error.js

@@ -1,7 +1,7 @@
 import { isFedRamp } from './environment';
 const SENTRY_DSN = 'https://0b10c8e02fb44d8796c047b102c9bee8@o55978.ingest.sentry.io/4505129224110080';
 const packageName = 'editor-common'; // Sentry doesn't accept '/' in its releases https://docs.sentry.io/platforms/javascript/configuration/releases/
-const packageVersion = "96.5.4";
+const packageVersion = "96.5.6";
 const sanitiseSentryEvents = (data, _hint) => {
   // Remove URL as it has UGC
   // TODO: Sanitise the URL instead of just removing it

package/dist/es2019/resizer/BreakoutResizer.js

@@ -1,5 +1,6 @@
 import React, { useCallback, useEffect, useMemo, useState } from 'react';
 import { akEditorDefaultLayoutWidth, akEditorFullWidthLayoutWidth, akEditorGutterPadding, akEditorGutterPaddingDynamic } from '@atlaskit/editor-shared-styles';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { ACTION, ACTION_SUBJECT, EVENT_TYPE } from '../analytics';
 import { LAYOUT_COLUMN_PADDING, LAYOUT_SECTION_MARGIN } from '../styles';
@@ -36,7 +37,17 @@ const getHandleStyle = node => {
   }
 };
 export const ignoreResizerMutations = mutation => {
-  return mutation.target.classList.contains('resizer-item') || mutation.type === 'attributes' && mutation.attributeName === 'style';
+  if (fg('platform_editor_breakoutresizer_remove_assertion')) {
+    if (mutation.target instanceof Element) {
+      return mutation.target.classList.contains('resizer-item') || mutation.type === 'attributes' && mutation.attributeName === 'style';
+    }
+    return mutation.type === 'attributes' && mutation.attributeName === 'style';
+  } else {
+    return (
+      // eslint-disable-next-line @atlaskit/editor/no-as-casting
+      mutation.target.classList.contains('resizer-item') || mutation.type === 'attributes' && mutation.attributeName === 'style'
+    );
+  }
 };
 const resizingStyles = {
   left: '50%',
@@ -104,8 +115,12 @@ const BreakoutResizer = ({
     } = editorView;
     displayGapCursor(false);
     if (widthState !== undefined && widthState.lineLength !== undefined && widthState.width !== undefined) {
-      newMinWidth = Math.min(widthState.lineLength, akEditorDefaultLayoutWidth);
       newMaxWidth = Math.min(widthState.width - akEditorGutterPaddingDynamic() * 2 - akEditorGutterPadding, akEditorFullWidthLayoutWidth);
+      if (fg('platform_editor_advanced_layouts_post_fix_patch_2')) {
+        newMinWidth = Math.min(widthState.lineLength, akEditorDefaultLayoutWidth, newMaxWidth);
+      } else {
+        newMinWidth = Math.min(widthState.lineLength, akEditorDefaultLayoutWidth);
+      }
     }
     setResizingState({
       isResizing: true,

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

@@ -13,7 +13,7 @@ import withAnalyticsContext from '@atlaskit/analytics-next/withAnalyticsContext'
 import withAnalyticsEvents from '@atlaskit/analytics-next/withAnalyticsEvents';
 import Layer from '../Layer';
 const packageName = "@atlaskit/editor-common";
-const packageVersion = "96.5.4";
+const packageVersion = "96.5.6";
 const halfFocusRing = 1;
 const dropOffset = '0, 8';
 class DropList extends Component {

package/dist/es2019/utils/table.js

@@ -1,4 +1,28 @@
+import { fg } from '@atlaskit/platform-feature-flags';
 export function calcTableColumnWidths(node) {
+  if (fg('platform_editor_table_row_span_fix')) {
+    const firstRow = node.firstChild;
+    let tableColumnWidths = [];
+    if (firstRow) {
+      firstRow.forEach(cell => {
+        const {
+          colspan,
+          colwidth
+        } = cell.attrs;
+        // column has been resized, colWidth will be an array, can safely take values even if cell is merged
+        if (Array.isArray(colwidth)) {
+          tableColumnWidths.push(...colwidth);
+          // table has merged cells but no colWidth, so columns haven't been resized, default to 0
+        } else if (colspan > 1) {
+          tableColumnWidths.push(...Array(colspan).fill(0));
+          // no merged cells, no column resized, default to 0
+        } else {
+          tableColumnWidths.push(0);
+        }
+      });
+    }
+    return tableColumnWidths;
+  }
   let tableColumnWidths = [];
   const firstRow = node.firstChild;
   if (firstRow) {

package/dist/esm/monitoring/error.js

@@ -7,7 +7,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 import { isFedRamp } from './environment';
 var SENTRY_DSN = 'https://0b10c8e02fb44d8796c047b102c9bee8@o55978.ingest.sentry.io/4505129224110080';
 var packageName = 'editor-common'; // Sentry doesn't accept '/' in its releases https://docs.sentry.io/platforms/javascript/configuration/releases/
-var packageVersion = "96.5.4";
+var packageVersion = "96.5.6";
 var sanitiseSentryEvents = function sanitiseSentryEvents(data, _hint) {
   // Remove URL as it has UGC
   // TODO: Sanitise the URL instead of just removing it

package/dist/esm/resizer/BreakoutResizer.js

@@ -1,6 +1,7 @@
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import React, { useCallback, useEffect, useMemo, useState } from 'react';
 import { akEditorDefaultLayoutWidth, akEditorFullWidthLayoutWidth, akEditorGutterPadding, akEditorGutterPaddingDynamic } from '@atlaskit/editor-shared-styles';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { ACTION, ACTION_SUBJECT, EVENT_TYPE } from '../analytics';
 import { LAYOUT_COLUMN_PADDING, LAYOUT_SECTION_MARGIN } from '../styles';
@@ -37,7 +38,17 @@ var getHandleStyle = function getHandleStyle(node) {
   }
 };
 export var ignoreResizerMutations = function ignoreResizerMutations(mutation) {
-  return mutation.target.classList.contains('resizer-item') || mutation.type === 'attributes' && mutation.attributeName === 'style';
+  if (fg('platform_editor_breakoutresizer_remove_assertion')) {
+    if (mutation.target instanceof Element) {
+      return mutation.target.classList.contains('resizer-item') || mutation.type === 'attributes' && mutation.attributeName === 'style';
+    }
+    return mutation.type === 'attributes' && mutation.attributeName === 'style';
+  } else {
+    return (
+      // eslint-disable-next-line @atlaskit/editor/no-as-casting
+      mutation.target.classList.contains('resizer-item') || mutation.type === 'attributes' && mutation.attributeName === 'style'
+    );
+  }
 };
 var resizingStyles = {
   left: '50%',
@@ -103,8 +114,12 @@ var BreakoutResizer = function BreakoutResizer(_ref) {
       state = editorView.state;
     displayGapCursor(false);
     if (widthState !== undefined && widthState.lineLength !== undefined && widthState.width !== undefined) {
-      newMinWidth = Math.min(widthState.lineLength, akEditorDefaultLayoutWidth);
       newMaxWidth = Math.min(widthState.width - akEditorGutterPaddingDynamic() * 2 - akEditorGutterPadding, akEditorFullWidthLayoutWidth);
+      if (fg('platform_editor_advanced_layouts_post_fix_patch_2')) {
+        newMinWidth = Math.min(widthState.lineLength, akEditorDefaultLayoutWidth, newMaxWidth);
+      } else {
+        newMinWidth = Math.min(widthState.lineLength, akEditorDefaultLayoutWidth);
+      }
     }
     setResizingState({
       isResizing: true,

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

@@ -20,7 +20,7 @@ import withAnalyticsContext from '@atlaskit/analytics-next/withAnalyticsContext'
 import withAnalyticsEvents from '@atlaskit/analytics-next/withAnalyticsEvents';
 import Layer from '../Layer';
 var packageName = "@atlaskit/editor-common";
-var packageVersion = "96.5.4";
+var packageVersion = "96.5.6";
 var halfFocusRing = 1;
 var dropOffset = '0, 8';
 var DropList = /*#__PURE__*/function (_Component) {

package/dist/esm/utils/table.js

@@ -1,5 +1,28 @@
 import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
+import { fg } from '@atlaskit/platform-feature-flags';
 export function calcTableColumnWidths(node) {
+  if (fg('platform_editor_table_row_span_fix')) {
+    var _firstRow = node.firstChild;
+    var _tableColumnWidths = [];
+    if (_firstRow) {
+      _firstRow.forEach(function (cell) {
+        var _cell$attrs = cell.attrs,
+          colspan = _cell$attrs.colspan,
+          colwidth = _cell$attrs.colwidth;
+        // column has been resized, colWidth will be an array, can safely take values even if cell is merged
+        if (Array.isArray(colwidth)) {
+          _tableColumnWidths.push.apply(_tableColumnWidths, _toConsumableArray(colwidth));
+          // table has merged cells but no colWidth, so columns haven't been resized, default to 0
+        } else if (colspan > 1) {
+          _tableColumnWidths.push.apply(_tableColumnWidths, _toConsumableArray(Array(colspan).fill(0)));
+          // no merged cells, no column resized, default to 0
+        } else {
+          _tableColumnWidths.push(0);
+        }
+      });
+    }
+    return _tableColumnWidths;
+  }
   var tableColumnWidths = [];
   var firstRow = node.firstChild;
   if (firstRow) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-common",
-	"version": "96.5.4",
+	"version": "96.5.6",
 	"description": "A package that contains common classes and components for editor and renderer",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -306,6 +306,15 @@
 		},
 		"platform_editor_legacy_content_macro": {
 			"type": "boolean"
+		},
+		"platform_editor_advanced_layouts_post_fix_patch_2": {
+			"type": "boolean"
+		},
+		"platform_editor_breakoutresizer_remove_assertion": {
+			"type": "boolean"
+		},
+		"platform_editor_table_row_span_fix": {
+			"type": "boolean"
 		}
 	}
 }