@atlaskit/editor-common 96.5.5 → 96.5.7

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @atlaskit/editor-common
 
+## 96.5.7
+
+### Patch Changes
+
+- [#179069](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/179069)
+  [`abcf8b3555cac`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/abcf8b3555cac) -
+  Fix issue where new Forge bodied macros don't show content in live page rendered view
+
+## 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

package/dist/cjs/extensibility/ExtensionComponent.js

@@ -165,10 +165,10 @@ var ExtensionComponentOld = exports.ExtensionComponentOld = /*#__PURE__*/functio
       };
       if (isBodiedExtension) {
         var rendererExtensionHandler = rendererExtensionHandlers === null || rendererExtensionHandlers === void 0 ? void 0 : rendererExtensionHandlers[extensionType];
-        if (!rendererExtensionHandler) {
-          return null;
+        // Forge bodied extensions don't get rendererExtensionHandlers passed in and use extensionHandlerFromProvider from the below logic instead
+        if (rendererExtensionHandler) {
+          return (0, _utils.getExtensionRenderer)(rendererExtensionHandler)(node, (0, _utils.toJSON)(editorView.state.doc));
         }
-        return (0, _utils.getExtensionRenderer)(rendererExtensionHandler)(node, (0, _utils.toJSON)(editorView.state.doc));
       }
       var result;
       if (extensionHandlers && extensionHandlers[extensionType]) {
@@ -461,10 +461,10 @@ var ExtensionComponentInner = /*#__PURE__*/function (_Component2) {
       };
       if (isBodiedExtension) {
         var rendererExtensionHandler = rendererExtensionHandlers === null || rendererExtensionHandlers === void 0 ? void 0 : rendererExtensionHandlers[extensionType];
-        if (!rendererExtensionHandler) {
-          return null;
+        // Forge bodied extensions don't get rendererExtensionHandlers passed in and use extensionHandlerFromProvider from the below logic instead
+        if (rendererExtensionHandler) {
+          return (0, _utils.getExtensionRenderer)(rendererExtensionHandler)(node, (0, _utils.toJSON)(editorView.state.doc));
         }
-        return (0, _utils.getExtensionRenderer)(rendererExtensionHandler)(node, (0, _utils.toJSON)(editorView.state.doc));
       }
       var result;
       if (extensionHandlers && extensionHandlers[extensionType]) {

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.5";
+var packageVersion = "96.5.7";
 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.5.5";
+var packageVersion = "96.5.7";
 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/extensibility/ExtensionComponent.js

@@ -130,10 +130,10 @@ export class ExtensionComponentOld extends Component {
       };
       if (isBodiedExtension) {
         const rendererExtensionHandler = rendererExtensionHandlers === null || rendererExtensionHandlers === void 0 ? void 0 : rendererExtensionHandlers[extensionType];
-        if (!rendererExtensionHandler) {
-          return null;
+        // Forge bodied extensions don't get rendererExtensionHandlers passed in and use extensionHandlerFromProvider from the below logic instead
+        if (rendererExtensionHandler) {
+          return getExtensionRenderer(rendererExtensionHandler)(node, toJSON(editorView.state.doc));
         }
-        return getExtensionRenderer(rendererExtensionHandler)(node, toJSON(editorView.state.doc));
       }
       let result;
       if (extensionHandlers && extensionHandlers[extensionType]) {
@@ -396,10 +396,10 @@ class ExtensionComponentInner extends Component {
       };
       if (isBodiedExtension) {
         const rendererExtensionHandler = rendererExtensionHandlers === null || rendererExtensionHandlers === void 0 ? void 0 : rendererExtensionHandlers[extensionType];
-        if (!rendererExtensionHandler) {
-          return null;
+        // Forge bodied extensions don't get rendererExtensionHandlers passed in and use extensionHandlerFromProvider from the below logic instead
+        if (rendererExtensionHandler) {
+          return getExtensionRenderer(rendererExtensionHandler)(node, toJSON(editorView.state.doc));
         }
-        return getExtensionRenderer(rendererExtensionHandler)(node, toJSON(editorView.state.doc));
       }
       let result;
       if (extensionHandlers && extensionHandlers[extensionType]) {

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.5";
+const packageVersion = "96.5.7";
 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.5.5";
+const packageVersion = "96.5.7";
 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/extensibility/ExtensionComponent.js

@@ -157,10 +157,10 @@ export var ExtensionComponentOld = /*#__PURE__*/function (_Component) {
       };
       if (isBodiedExtension) {
         var rendererExtensionHandler = rendererExtensionHandlers === null || rendererExtensionHandlers === void 0 ? void 0 : rendererExtensionHandlers[extensionType];
-        if (!rendererExtensionHandler) {
-          return null;
+        // Forge bodied extensions don't get rendererExtensionHandlers passed in and use extensionHandlerFromProvider from the below logic instead
+        if (rendererExtensionHandler) {
+          return getExtensionRenderer(rendererExtensionHandler)(node, toJSON(editorView.state.doc));
         }
-        return getExtensionRenderer(rendererExtensionHandler)(node, toJSON(editorView.state.doc));
       }
       var result;
       if (extensionHandlers && extensionHandlers[extensionType]) {
@@ -453,10 +453,10 @@ var ExtensionComponentInner = /*#__PURE__*/function (_Component2) {
       };
       if (isBodiedExtension) {
         var rendererExtensionHandler = rendererExtensionHandlers === null || rendererExtensionHandlers === void 0 ? void 0 : rendererExtensionHandlers[extensionType];
-        if (!rendererExtensionHandler) {
-          return null;
+        // Forge bodied extensions don't get rendererExtensionHandlers passed in and use extensionHandlerFromProvider from the below logic instead
+        if (rendererExtensionHandler) {
+          return getExtensionRenderer(rendererExtensionHandler)(node, toJSON(editorView.state.doc));
         }
-        return getExtensionRenderer(rendererExtensionHandler)(node, toJSON(editorView.state.doc));
       }
       var result;
       if (extensionHandlers && extensionHandlers[extensionType]) {

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.5";
+var packageVersion = "96.5.7";
 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.5.5";
+var packageVersion = "96.5.7";
 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.5",
+	"version": "96.5.7",
 	"description": "A package that contains common classes and components for editor and renderer",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -312,6 +312,9 @@
 		},
 		"platform_editor_breakoutresizer_remove_assertion": {
 			"type": "boolean"
+		},
+		"platform_editor_table_row_span_fix": {
+			"type": "boolean"
 		}
 	}
 }