@atlaskit/editor-common 96.6.0 → 96.6.1

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @atlaskit/editor-common
 
+## 96.6.1
+
+### Patch Changes
+
+- [#181016](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/181016)
+  [`fb9a503ee55c3`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/fb9a503ee55c3) -
+  Add new `getColumnWidths` function which will loop through each table row, looking for the max
+  number of table cells to use to render the table correctly when table resizing is enabled.
+
 ## 96.6.0
 
 ### Minor 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.6.0";
+var packageVersion = "96.6.1";
 var sanitiseSentryEvents = function sanitiseSentryEvents(data, _hint) {
   // Remove URL as it has UGC
   // TODO: Sanitise the URL instead of just removing it

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.6.0";
+var packageVersion = "96.6.1";
 var halfFocusRing = 1;
 var dropOffset = '0, 8';
 var DropList = /*#__PURE__*/function (_Component) {

package/dist/cjs/utils/index.js

@@ -432,6 +432,12 @@ Object.defineProperty(exports, "getChildrenInfo", {
     return _referentiality.getChildrenInfo;
   }
 });
+Object.defineProperty(exports, "getColumnWidths", {
+  enumerable: true,
+  get: function get() {
+    return _table.getColumnWidths;
+  }
+});
 Object.defineProperty(exports, "getDatasourceType", {
   enumerable: true,
   get: function get() {

package/dist/cjs/utils/table.js

@@ -6,11 +6,44 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.calcTableColumnWidths = calcTableColumnWidths;
 exports.convertProsemirrorTableNodeToArrayOfRows = convertProsemirrorTableNodeToArrayOfRows;
+exports.getColumnWidths = getColumnWidths;
 exports.hasMergedCell = hasMergedCell;
 exports.isPositionNearTableRow = isPositionNearTableRow;
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
+/**
+ * Looks at every table row to find the correct number of columns for table, which
+ * accounts for tables with uneven rows.
+ *
+ * Returns an array of column widths if defined otherwise 0, positions respect table order.
+ */
+function getColumnWidths(node) {
+  var tableColumnWidths = [];
+  node.forEach(function (row) {
+    var currentTableWidth = [];
+    row.forEach(function (cell) {
+      var _ref = cell.attrs,
+        colspan = _ref.colspan,
+        colwidth = _ref.colwidth;
+      // column has been resized, colWidth will be an array, can safely take values even if cell is merged
+      if (Array.isArray(colwidth)) {
+        currentTableWidth.push.apply(currentTableWidth, (0, _toConsumableArray2.default)(colwidth));
+        // table has merged cells but no colWidth, so columns haven't been resized, default to 0
+      } else if (colspan !== undefined && colspan > 1) {
+        currentTableWidth.push.apply(currentTableWidth, (0, _toConsumableArray2.default)(Array(colspan).fill(0)));
+        // no merged cells, no column resized, default to 0
+      } else {
+        currentTableWidth.push(0);
+      }
+    });
+    if (currentTableWidth.length > tableColumnWidths.length) {
+      tableColumnWidths = currentTableWidth;
+    }
+  });
+  return tableColumnWidths;
+}
 function calcTableColumnWidths(node) {
+  // TODO: replaced with getColumnWidths, which correctly scans entire table for column widths
   if ((0, _platformFeatureFlags.fg)('platform_editor_table_row_span_fix')) {
     var _firstRow = node.firstChild;
     var _tableColumnWidths = [];

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.6.0";
+const packageVersion = "96.6.1";
 const sanitiseSentryEvents = (data, _hint) => {
   // Remove URL as it has UGC
   // TODO: Sanitise the URL instead of just removing it

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.6.0";
+const packageVersion = "96.6.1";
 const halfFocusRing = 1;
 const dropOffset = '0, 8';
 class DropList extends Component {

package/dist/es2019/utils/index.js

@@ -122,7 +122,7 @@ export { isPerformanceAPIAvailable, isPerformanceObserverAvailable } from './per
  */
 export { getResponseEndTime } from './performance/navigation';
 export { getExtensionRenderer } from './extension-handler';
-export { hasMergedCell, calcTableColumnWidths, convertProsemirrorTableNodeToArrayOfRows, isPositionNearTableRow } from './table';
+export { hasMergedCell, getColumnWidths, calcTableColumnWidths, convertProsemirrorTableNodeToArrayOfRows, isPositionNearTableRow } from './table';
 export { createCompareNodes } from './compareNodes';
 export { compose } from './compose';
 export { isTextInput } from './is-text-input';

package/dist/es2019/utils/table.js

@@ -1,5 +1,39 @@
 import { fg } from '@atlaskit/platform-feature-flags';
+
+/**
+ * Looks at every table row to find the correct number of columns for table, which
+ * accounts for tables with uneven rows.
+ *
+ * Returns an array of column widths if defined otherwise 0, positions respect table order.
+ */
+export function getColumnWidths(node) {
+  let tableColumnWidths = [];
+  node.forEach(row => {
+    let currentTableWidth = [];
+    row.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)) {
+        currentTableWidth.push(...colwidth);
+        // table has merged cells but no colWidth, so columns haven't been resized, default to 0
+      } else if (colspan !== undefined && colspan > 1) {
+        currentTableWidth.push(...Array(colspan).fill(0));
+        // no merged cells, no column resized, default to 0
+      } else {
+        currentTableWidth.push(0);
+      }
+    });
+    if (currentTableWidth.length > tableColumnWidths.length) {
+      tableColumnWidths = currentTableWidth;
+    }
+  });
+  return tableColumnWidths;
+}
 export function calcTableColumnWidths(node) {
+  // TODO: replaced with getColumnWidths, which correctly scans entire table for column widths
   if (fg('platform_editor_table_row_span_fix')) {
     const firstRow = node.firstChild;
     let tableColumnWidths = [];

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.6.0";
+var packageVersion = "96.6.1";
 var sanitiseSentryEvents = function sanitiseSentryEvents(data, _hint) {
   // Remove URL as it has UGC
   // TODO: Sanitise the URL instead of just removing it

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.6.0";
+var packageVersion = "96.6.1";
 var halfFocusRing = 1;
 var dropOffset = '0, 8';
 var DropList = /*#__PURE__*/function (_Component) {

package/dist/esm/utils/index.js

@@ -122,7 +122,7 @@ export { isPerformanceAPIAvailable, isPerformanceObserverAvailable } from './per
  */
 export { getResponseEndTime } from './performance/navigation';
 export { getExtensionRenderer } from './extension-handler';
-export { hasMergedCell, calcTableColumnWidths, convertProsemirrorTableNodeToArrayOfRows, isPositionNearTableRow } from './table';
+export { hasMergedCell, getColumnWidths, calcTableColumnWidths, convertProsemirrorTableNodeToArrayOfRows, isPositionNearTableRow } from './table';
 export { createCompareNodes } from './compareNodes';
 export { compose } from './compose';
 export { isTextInput } from './is-text-input';

package/dist/esm/utils/table.js

@@ -1,6 +1,39 @@
 import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 import { fg } from '@atlaskit/platform-feature-flags';
+
+/**
+ * Looks at every table row to find the correct number of columns for table, which
+ * accounts for tables with uneven rows.
+ *
+ * Returns an array of column widths if defined otherwise 0, positions respect table order.
+ */
+export function getColumnWidths(node) {
+  var tableColumnWidths = [];
+  node.forEach(function (row) {
+    var currentTableWidth = [];
+    row.forEach(function (cell) {
+      var _ref = cell.attrs,
+        colspan = _ref.colspan,
+        colwidth = _ref.colwidth;
+      // column has been resized, colWidth will be an array, can safely take values even if cell is merged
+      if (Array.isArray(colwidth)) {
+        currentTableWidth.push.apply(currentTableWidth, _toConsumableArray(colwidth));
+        // table has merged cells but no colWidth, so columns haven't been resized, default to 0
+      } else if (colspan !== undefined && colspan > 1) {
+        currentTableWidth.push.apply(currentTableWidth, _toConsumableArray(Array(colspan).fill(0)));
+        // no merged cells, no column resized, default to 0
+      } else {
+        currentTableWidth.push(0);
+      }
+    });
+    if (currentTableWidth.length > tableColumnWidths.length) {
+      tableColumnWidths = currentTableWidth;
+    }
+  });
+  return tableColumnWidths;
+}
 export function calcTableColumnWidths(node) {
+  // TODO: replaced with getColumnWidths, which correctly scans entire table for column widths
   if (fg('platform_editor_table_row_span_fix')) {
     var _firstRow = node.firstChild;
     var _tableColumnWidths = [];

package/dist/types/utils/index.d.ts

@@ -127,7 +127,7 @@ export { isPerformanceAPIAvailable, isPerformanceObserverAvailable, } from './pe
  */
 export { getResponseEndTime } from './performance/navigation';
 export { getExtensionRenderer } from './extension-handler';
-export { hasMergedCell, calcTableColumnWidths, convertProsemirrorTableNodeToArrayOfRows, isPositionNearTableRow, } from './table';
+export { hasMergedCell, getColumnWidths, calcTableColumnWidths, convertProsemirrorTableNodeToArrayOfRows, isPositionNearTableRow, } from './table';
 export { createCompareNodes } from './compareNodes';
 export { compose } from './compose';
 export { isTextInput } from './is-text-input';

package/dist/types/utils/table.d.ts

@@ -1,4 +1,11 @@
 import type { Node as PmNode, ResolvedPos, Schema } from '@atlaskit/editor-prosemirror/model';
+/**
+ * Looks at every table row to find the correct number of columns for table, which
+ * accounts for tables with uneven rows.
+ *
+ * Returns an array of column widths if defined otherwise 0, positions respect table order.
+ */
+export declare function getColumnWidths(node: PmNode): number[];
 export declare function calcTableColumnWidths(node: PmNode): number[];
 export declare function hasMergedCell(tableNode: PmNode): boolean;
 export declare function convertProsemirrorTableNodeToArrayOfRows(tableNode: PmNode): Array<Array<PmNode | null>>;

package/dist/types-ts4.5/utils/index.d.ts

@@ -127,7 +127,7 @@ export { isPerformanceAPIAvailable, isPerformanceObserverAvailable, } from './pe
  */
 export { getResponseEndTime } from './performance/navigation';
 export { getExtensionRenderer } from './extension-handler';
-export { hasMergedCell, calcTableColumnWidths, convertProsemirrorTableNodeToArrayOfRows, isPositionNearTableRow, } from './table';
+export { hasMergedCell, getColumnWidths, calcTableColumnWidths, convertProsemirrorTableNodeToArrayOfRows, isPositionNearTableRow, } from './table';
 export { createCompareNodes } from './compareNodes';
 export { compose } from './compose';
 export { isTextInput } from './is-text-input';

package/dist/types-ts4.5/utils/table.d.ts

@@ -1,4 +1,11 @@
 import type { Node as PmNode, ResolvedPos, Schema } from '@atlaskit/editor-prosemirror/model';
+/**
+ * Looks at every table row to find the correct number of columns for table, which
+ * accounts for tables with uneven rows.
+ *
+ * Returns an array of column widths if defined otherwise 0, positions respect table order.
+ */
+export declare function getColumnWidths(node: PmNode): number[];
 export declare function calcTableColumnWidths(node: PmNode): number[];
 export declare function hasMergedCell(tableNode: PmNode): boolean;
 export declare function convertProsemirrorTableNodeToArrayOfRows(tableNode: PmNode): Array<Array<PmNode | null>>;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-common",
-	"version": "96.6.0",
+	"version": "96.6.1",
 	"description": "A package that contains common classes and components for editor and renderer",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"