@atlaskit/renderer 109.32.1 → 109.32.3

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @atlaskit/renderer
 
+## 109.32.3
+
+### Patch Changes
+
+- [#109969](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/109969)
+  [`52590a0b562ef`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/52590a0b562ef) -
+  ED-23690 Adds an attribute to annotation analytic events with the name of nodes inside the
+  annotation range
+- Updated dependencies
+
+## 109.32.2
+
+### Patch Changes
+
+- [#109033](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/109033)
+  [`046555d9a96ea`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/046555d9a96ea) -
+  Converts LD flag to an experiment for Preserve Table Widths part two feature.
+
 ## 109.32.1
 
 ### Patch Changes

package/dist/cjs/actions/get-renderer-range-inline-node-names.js

@@ -0,0 +1,24 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getRendererRangeInlineNodeNames = getRendererRangeInlineNodeNames;
+var _utils = require("@atlaskit/editor-common/utils");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
+function getRendererRangeInlineNodeNames(_ref) {
+  var actions = _ref.actions,
+    pos = _ref.pos;
+  if (!(0, _platformFeatureFlags.getBooleanFF)('platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz')) {
+    return undefined;
+  }
+  var doc = actions.doc;
+  if (!pos || !doc) {
+    return undefined;
+  }
+  var inlineNodeNames = (0, _utils.getRangeInlineNodeNames)({
+    doc: doc,
+    pos: pos
+  });
+  return inlineNodeNames;
+}

package/dist/cjs/actions/index.js

@@ -16,6 +16,7 @@ var _transform = require("@atlaskit/editor-prosemirror/transform");
 var _steps = require("../steps");
 var _analytics = require("@atlaskit/editor-common/analytics");
 var _matchesUtils = require("./matches-utils");
+var _getRendererRangeInlineNodeNames = require("./get-renderer-range-inline-node-names");
 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; }
 var RendererActions = exports.default = /*#__PURE__*/function () {
@@ -116,7 +117,16 @@ var RendererActions = exports.default = /*#__PURE__*/function () {
           action: _analytics.ACTION.DELETED,
           actionSubject: _analytics.ACTION_SUBJECT.ANNOTATION,
           actionSubjectId: _analytics.ACTION_SUBJECT_ID.INLINE_COMMENT,
-          eventType: _analytics.EVENT_TYPE.TRACK
+          eventType: _analytics.EVENT_TYPE.TRACK,
+          attributes: {
+            inlineNodeNames: step instanceof _transform.RemoveMarkStep ? (0, _getRendererRangeInlineNodeNames.getRendererRangeInlineNodeNames)({
+              pos: {
+                from: from,
+                to: to
+              },
+              actions: this
+            }) : undefined
+          }
         };
         this.onAnalyticsEvent(payload);
       }
@@ -169,6 +179,10 @@ var RendererActions = exports.default = /*#__PURE__*/function () {
       }
       return this._privateValidatePositionsForAnnotation(pos.from, pos.to);
     }
+
+    /**
+     * Note: False indicates that the selection not able to be calculated.
+     */
   }, {
     key: "getPositionFromRange",
     value: function getPositionFromRange(range, isCommentsOnMediaBugFixEnabled, isCommentsOnMediaBugVideoComment) {

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

@@ -62,7 +62,8 @@ var renderScaleDownColgroup = function renderScaleDownColgroup(props) {
     rendererAppearance = props.rendererAppearance,
     isInsideOfBlockNode = props.isInsideOfBlockNode,
     isinsideMultiBodiedExtension = props.isinsideMultiBodiedExtension,
-    isTableScalingEnabled = props.isTableScalingEnabled;
+    isTableScalingEnabled = props.isTableScalingEnabled,
+    isTableFixedColumnWidthsOptionEnabled = props.isTableFixedColumnWidthsOptionEnabled;
   if (!columnWidths) {
     return [];
   }
@@ -128,9 +129,9 @@ var renderScaleDownColgroup = function renderScaleDownColgroup(props) {
   });
   var cellMinWidth = 0;
   var scaleDownPercent = 0;
-  var isTableWithLockButtonEnabled = (0, _platformFeatureFlags.getBooleanFF)('platform.editor.table.preserve-widths-with-lock-button') && isTableScalingEnabled;
-  var isTableWidthFixed = isTableWithLockButtonEnabled && ((_props$tableNode = props.tableNode) === null || _props$tableNode === void 0 ? void 0 : _props$tableNode.attrs.displayMode) === 'fixed';
-  var maxScalingPercent = (0, _platformFeatureFlags.getBooleanFF)('platform.editor.table.use-increased-scaling-percent') && isTableWithLockButtonEnabled ? MAX_SCALING_PERCENT_TABLES_WITH_FIXED_COLUMN_WIDTHS_OPTION : MAX_SCALING_PERCENT;
+  var isTableScalingWithFixedColumnWidthsOptionEnabled = isTableScalingEnabled && isTableFixedColumnWidthsOptionEnabled;
+  var isTableWidthFixed = isTableScalingWithFixedColumnWidthsOptionEnabled && ((_props$tableNode = props.tableNode) === null || _props$tableNode === void 0 ? void 0 : _props$tableNode.attrs.displayMode) === 'fixed';
+  var maxScalingPercent = (0, _platformFeatureFlags.getBooleanFF)('platform.editor.table.use-increased-scaling-percent') && isTableScalingWithFixedColumnWidthsOptionEnabled ? MAX_SCALING_PERCENT_TABLES_WITH_FIXED_COLUMN_WIDTHS_OPTION : MAX_SCALING_PERCENT;
 
   // fixes migration tables with zero-width columns
   if (zeroWidthColumnsCount > 0) {
@@ -163,7 +164,8 @@ var Colgroup = exports.Colgroup = function Colgroup(props) {
     return null;
   }
   var colStyles = renderScaleDownColgroup(_objectSpread(_objectSpread({}, props), {}, {
-    isTableScalingEnabled: !!(flags && 'tablePreserveWidth' in flags && flags.tablePreserveWidth)
+    isTableScalingEnabled: !!(flags && 'tablePreserveWidth' in flags && flags.tablePreserveWidth),
+    isTableFixedColumnWidthsOptionEnabled: !!(flags && 'tableWithFixedColumnWidthsOption' in flags && flags.tableWithFixedColumnWidthsOption)
   }));
   if (!colStyles) {
     return null;

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

package/dist/cjs/ui/annotations/selection/mounter.js

@@ -12,6 +12,7 @@ var _adfSchema = require("@atlaskit/adf-schema");
 var _draft = require("../draft");
 var _analyticsListeners = require("@atlaskit/analytics-listeners");
 var _analytics = require("@atlaskit/editor-common/analytics");
+var _getRendererRangeInlineNodeNames = require("../../../actions/get-renderer-range-inline-node-names");
 var _RendererActionsContext = require("../../RendererActionsContext");
 var _context = require("../context");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
@@ -58,7 +59,12 @@ var SelectionInlineCommentMounter = exports.SelectionInlineCommentMounter = /*#_
         action: _analytics.ACTION.INSERTED,
         actionSubject: _analytics.ACTION_SUBJECT.ANNOTATION,
         actionSubjectId: _analytics.ACTION_SUBJECT_ID.INLINE_COMMENT,
-        attributes: {},
+        attributes: {
+          inlineNodeNames: (0, _getRendererRangeInlineNodeNames.getRendererRangeInlineNodeNames)({
+            pos: positionToAnnotate,
+            actions: actions
+          })
+        },
         eventType: _analytics.EVENT_TYPE.TRACK
       }).fire(_analyticsListeners.FabricChannel.editor);
     }
@@ -81,7 +87,12 @@ var SelectionInlineCommentMounter = exports.SelectionInlineCommentMounter = /*#_
           action: _analytics.ACTION.CREATE_NOT_ALLOWED,
           actionSubject: _analytics.ACTION_SUBJECT.ANNOTATION,
           actionSubjectId: _analytics.ACTION_SUBJECT_ID.INLINE_COMMENT,
-          attributes: {},
+          attributes: {
+            inlineNodeNames: (0, _getRendererRangeInlineNodeNames.getRendererRangeInlineNodeNames)({
+              pos: documentPosition,
+              actions: actions
+            })
+          },
           eventType: _analytics.EVENT_TYPE.TRACK
         }).fire(_analyticsListeners.FabricChannel.editor);
       }
@@ -97,7 +108,11 @@ var SelectionInlineCommentMounter = exports.SelectionInlineCommentMounter = /*#_
         actionSubjectId: _analytics.ACTION_SUBJECT_ID.INLINE_COMMENT,
         eventType: _analytics.EVENT_TYPE.TRACK,
         attributes: {
-          overlap: uniqueAnnotationsInRange.length
+          overlap: uniqueAnnotationsInRange.length,
+          inlineNodeNames: (0, _getRendererRangeInlineNodeNames.getRendererRangeInlineNodeNames)({
+            pos: documentPosition,
+            actions: actions
+          })
         }
       }).fire(_analyticsListeners.FabricChannel.editor);
     }
@@ -136,12 +151,17 @@ var SelectionInlineCommentMounter = exports.SelectionInlineCommentMounter = /*#_
         actionSubject: _analytics.ACTION_SUBJECT.ANNOTATION,
         actionSubjectId: _analytics.ACTION_SUBJECT_ID.INLINE_COMMENT,
         eventType: _analytics.EVENT_TYPE.TRACK,
-        attributes: {}
+        attributes: {
+          inlineNodeNames: (0, _getRendererRangeInlineNodeNames.getRendererRangeInlineNodeNames)({
+            pos: documentPosition,
+            actions: actions
+          })
+        }
       }).fire(_analyticsListeners.FabricChannel.editor);
     }
     removeDraftModeCallback();
     onCloseProps();
-  }, [onCloseProps, removeDraftModeCallback, createAnalyticsEvent]);
+  }, [actions, documentPosition, onCloseProps, removeDraftModeCallback, createAnalyticsEvent]);
   return /*#__PURE__*/_react.default.createElement(Component, {
     range: range,
     draftRange: draftRange,

package/dist/es2019/actions/get-renderer-range-inline-node-names.js

@@ -0,0 +1,19 @@
+import { getRangeInlineNodeNames } from '@atlaskit/editor-common/utils';
+import { getBooleanFF } from '@atlaskit/platform-feature-flags';
+export function getRendererRangeInlineNodeNames({
+  actions,
+  pos
+}) {
+  if (!getBooleanFF('platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz')) {
+    return undefined;
+  }
+  const doc = actions.doc;
+  if (!pos || !doc) {
+    return undefined;
+  }
+  const inlineNodeNames = getRangeInlineNodeNames({
+    doc,
+    pos
+  });
+  return inlineNodeNames;
+}

package/dist/es2019/actions/index.js

@@ -6,6 +6,7 @@ import { AddNodeMarkStep, RemoveMarkStep, RemoveNodeMarkStep } from '@atlaskit/e
 import { createAnnotationStep, getPosFromRange } from '../steps';
 import { ACTION, ACTION_SUBJECT, EVENT_TYPE, ACTION_SUBJECT_ID } from '@atlaskit/editor-common/analytics';
 import { getIndexMatch } from './matches-utils';
+import { getRendererRangeInlineNodeNames } from './get-renderer-range-inline-node-names';
 export default class RendererActions {
   // Any kind of refence is allowed
 
@@ -96,7 +97,16 @@ export default class RendererActions {
         action: ACTION.DELETED,
         actionSubject: ACTION_SUBJECT.ANNOTATION,
         actionSubjectId: ACTION_SUBJECT_ID.INLINE_COMMENT,
-        eventType: EVENT_TYPE.TRACK
+        eventType: EVENT_TYPE.TRACK,
+        attributes: {
+          inlineNodeNames: step instanceof RemoveMarkStep ? getRendererRangeInlineNodeNames({
+            pos: {
+              from: from,
+              to: to
+            },
+            actions: this
+          }) : undefined
+        }
       };
       this.onAnalyticsEvent(payload);
     }
@@ -145,6 +155,10 @@ export default class RendererActions {
     }
     return this._privateValidatePositionsForAnnotation(pos.from, pos.to);
   }
+
+  /**
+   * Note: False indicates that the selection not able to be calculated.
+   */
   getPositionFromRange(range, isCommentsOnMediaBugFixEnabled, isCommentsOnMediaBugVideoComment) {
     if (!this.doc || !this.schema || !range) {
       return false;

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

@@ -48,7 +48,8 @@ const renderScaleDownColgroup = props => {
     rendererAppearance,
     isInsideOfBlockNode,
     isinsideMultiBodiedExtension,
-    isTableScalingEnabled
+    isTableScalingEnabled,
+    isTableFixedColumnWidthsOptionEnabled
   } = props;
   if (!columnWidths) {
     return [];
@@ -115,9 +116,9 @@ const renderScaleDownColgroup = props => {
   });
   let cellMinWidth = 0;
   let scaleDownPercent = 0;
-  const isTableWithLockButtonEnabled = getBooleanFF('platform.editor.table.preserve-widths-with-lock-button') && isTableScalingEnabled;
-  const isTableWidthFixed = isTableWithLockButtonEnabled && ((_props$tableNode = props.tableNode) === null || _props$tableNode === void 0 ? void 0 : _props$tableNode.attrs.displayMode) === 'fixed';
-  const maxScalingPercent = getBooleanFF('platform.editor.table.use-increased-scaling-percent') && isTableWithLockButtonEnabled ? MAX_SCALING_PERCENT_TABLES_WITH_FIXED_COLUMN_WIDTHS_OPTION : MAX_SCALING_PERCENT;
+  const isTableScalingWithFixedColumnWidthsOptionEnabled = isTableScalingEnabled && isTableFixedColumnWidthsOptionEnabled;
+  const isTableWidthFixed = isTableScalingWithFixedColumnWidthsOptionEnabled && ((_props$tableNode = props.tableNode) === null || _props$tableNode === void 0 ? void 0 : _props$tableNode.attrs.displayMode) === 'fixed';
+  const maxScalingPercent = getBooleanFF('platform.editor.table.use-increased-scaling-percent') && isTableScalingWithFixedColumnWidthsOptionEnabled ? MAX_SCALING_PERCENT_TABLES_WITH_FIXED_COLUMN_WIDTHS_OPTION : MAX_SCALING_PERCENT;
 
   // fixes migration tables with zero-width columns
   if (zeroWidthColumnsCount > 0) {
@@ -153,7 +154,8 @@ export const Colgroup = props => {
   }
   const colStyles = renderScaleDownColgroup({
     ...props,
-    isTableScalingEnabled: !!(flags && 'tablePreserveWidth' in flags && flags.tablePreserveWidth)
+    isTableScalingEnabled: !!(flags && 'tablePreserveWidth' in flags && flags.tablePreserveWidth),
+    isTableFixedColumnWidthsOptionEnabled: !!(flags && 'tableWithFixedColumnWidthsOption' in flags && flags.tableWithFixedColumnWidthsOption)
   });
   if (!colStyles) {
     return null;

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

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

package/dist/es2019/ui/annotations/selection/mounter.js

@@ -3,6 +3,7 @@ import { AnnotationTypes } from '@atlaskit/adf-schema';
 import { updateWindowSelectionAroundDraft } from '../draft';
 import { FabricChannel } from '@atlaskit/analytics-listeners';
 import { ACTION, ACTION_SUBJECT, EVENT_TYPE, ACTION_SUBJECT_ID } from '@atlaskit/editor-common/analytics';
+import { getRendererRangeInlineNodeNames } from '../../../actions/get-renderer-range-inline-node-names';
 import { RendererContext as ActionsContext } from '../../RendererActionsContext';
 import { ProvidersContext } from '../context';
 export const SelectionInlineCommentMounter = /*#__PURE__*/React.memo(props => {
@@ -46,7 +47,12 @@ export const SelectionInlineCommentMounter = /*#__PURE__*/React.memo(props => {
         action: ACTION.INSERTED,
         actionSubject: ACTION_SUBJECT.ANNOTATION,
         actionSubjectId: ACTION_SUBJECT_ID.INLINE_COMMENT,
-        attributes: {},
+        attributes: {
+          inlineNodeNames: getRendererRangeInlineNodeNames({
+            pos: positionToAnnotate,
+            actions
+          })
+        },
         eventType: EVENT_TYPE.TRACK
       }).fire(FabricChannel.editor);
     }
@@ -69,7 +75,12 @@ export const SelectionInlineCommentMounter = /*#__PURE__*/React.memo(props => {
           action: ACTION.CREATE_NOT_ALLOWED,
           actionSubject: ACTION_SUBJECT.ANNOTATION,
           actionSubjectId: ACTION_SUBJECT_ID.INLINE_COMMENT,
-          attributes: {},
+          attributes: {
+            inlineNodeNames: getRendererRangeInlineNodeNames({
+              pos: documentPosition,
+              actions
+            })
+          },
           eventType: EVENT_TYPE.TRACK
         }).fire(FabricChannel.editor);
       }
@@ -85,7 +96,11 @@ export const SelectionInlineCommentMounter = /*#__PURE__*/React.memo(props => {
         actionSubjectId: ACTION_SUBJECT_ID.INLINE_COMMENT,
         eventType: EVENT_TYPE.TRACK,
         attributes: {
-          overlap: uniqueAnnotationsInRange.length
+          overlap: uniqueAnnotationsInRange.length,
+          inlineNodeNames: getRendererRangeInlineNodeNames({
+            pos: documentPosition,
+            actions
+          })
         }
       }).fire(FabricChannel.editor);
     }
@@ -124,12 +139,17 @@ export const SelectionInlineCommentMounter = /*#__PURE__*/React.memo(props => {
         actionSubject: ACTION_SUBJECT.ANNOTATION,
         actionSubjectId: ACTION_SUBJECT_ID.INLINE_COMMENT,
         eventType: EVENT_TYPE.TRACK,
-        attributes: {}
+        attributes: {
+          inlineNodeNames: getRendererRangeInlineNodeNames({
+            pos: documentPosition,
+            actions
+          })
+        }
       }).fire(FabricChannel.editor);
     }
     removeDraftModeCallback();
     onCloseProps();
-  }, [onCloseProps, removeDraftModeCallback, createAnalyticsEvent]);
+  }, [actions, documentPosition, onCloseProps, removeDraftModeCallback, createAnalyticsEvent]);
   return /*#__PURE__*/React.createElement(Component, {
     range: range,
     draftRange: draftRange,

package/dist/esm/actions/get-renderer-range-inline-node-names.js

@@ -0,0 +1,18 @@
+import { getRangeInlineNodeNames } from '@atlaskit/editor-common/utils';
+import { getBooleanFF } from '@atlaskit/platform-feature-flags';
+export function getRendererRangeInlineNodeNames(_ref) {
+  var actions = _ref.actions,
+    pos = _ref.pos;
+  if (!getBooleanFF('platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz')) {
+    return undefined;
+  }
+  var doc = actions.doc;
+  if (!pos || !doc) {
+    return undefined;
+  }
+  var inlineNodeNames = getRangeInlineNodeNames({
+    doc: doc,
+    pos: pos
+  });
+  return inlineNodeNames;
+}

package/dist/esm/actions/index.js

@@ -11,6 +11,7 @@ import { AddNodeMarkStep, RemoveMarkStep, RemoveNodeMarkStep } from '@atlaskit/e
 import { createAnnotationStep, getPosFromRange } from '../steps';
 import { ACTION, ACTION_SUBJECT, EVENT_TYPE, ACTION_SUBJECT_ID } from '@atlaskit/editor-common/analytics';
 import { getIndexMatch } from './matches-utils';
+import { getRendererRangeInlineNodeNames } from './get-renderer-range-inline-node-names';
 var RendererActions = /*#__PURE__*/function () {
   // Any kind of refence is allowed
 
@@ -109,7 +110,16 @@ var RendererActions = /*#__PURE__*/function () {
           action: ACTION.DELETED,
           actionSubject: ACTION_SUBJECT.ANNOTATION,
           actionSubjectId: ACTION_SUBJECT_ID.INLINE_COMMENT,
-          eventType: EVENT_TYPE.TRACK
+          eventType: EVENT_TYPE.TRACK,
+          attributes: {
+            inlineNodeNames: step instanceof RemoveMarkStep ? getRendererRangeInlineNodeNames({
+              pos: {
+                from: from,
+                to: to
+              },
+              actions: this
+            }) : undefined
+          }
         };
         this.onAnalyticsEvent(payload);
       }
@@ -162,6 +172,10 @@ var RendererActions = /*#__PURE__*/function () {
       }
       return this._privateValidatePositionsForAnnotation(pos.from, pos.to);
     }
+
+    /**
+     * Note: False indicates that the selection not able to be calculated.
+     */
   }, {
     key: "getPositionFromRange",
     value: function getPositionFromRange(range, isCommentsOnMediaBugFixEnabled, isCommentsOnMediaBugVideoComment) {

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

@@ -55,7 +55,8 @@ var renderScaleDownColgroup = function renderScaleDownColgroup(props) {
     rendererAppearance = props.rendererAppearance,
     isInsideOfBlockNode = props.isInsideOfBlockNode,
     isinsideMultiBodiedExtension = props.isinsideMultiBodiedExtension,
-    isTableScalingEnabled = props.isTableScalingEnabled;
+    isTableScalingEnabled = props.isTableScalingEnabled,
+    isTableFixedColumnWidthsOptionEnabled = props.isTableFixedColumnWidthsOptionEnabled;
   if (!columnWidths) {
     return [];
   }
@@ -121,9 +122,9 @@ var renderScaleDownColgroup = function renderScaleDownColgroup(props) {
   });
   var cellMinWidth = 0;
   var scaleDownPercent = 0;
-  var isTableWithLockButtonEnabled = getBooleanFF('platform.editor.table.preserve-widths-with-lock-button') && isTableScalingEnabled;
-  var isTableWidthFixed = isTableWithLockButtonEnabled && ((_props$tableNode = props.tableNode) === null || _props$tableNode === void 0 ? void 0 : _props$tableNode.attrs.displayMode) === 'fixed';
-  var maxScalingPercent = getBooleanFF('platform.editor.table.use-increased-scaling-percent') && isTableWithLockButtonEnabled ? MAX_SCALING_PERCENT_TABLES_WITH_FIXED_COLUMN_WIDTHS_OPTION : MAX_SCALING_PERCENT;
+  var isTableScalingWithFixedColumnWidthsOptionEnabled = isTableScalingEnabled && isTableFixedColumnWidthsOptionEnabled;
+  var isTableWidthFixed = isTableScalingWithFixedColumnWidthsOptionEnabled && ((_props$tableNode = props.tableNode) === null || _props$tableNode === void 0 ? void 0 : _props$tableNode.attrs.displayMode) === 'fixed';
+  var maxScalingPercent = getBooleanFF('platform.editor.table.use-increased-scaling-percent') && isTableScalingWithFixedColumnWidthsOptionEnabled ? MAX_SCALING_PERCENT_TABLES_WITH_FIXED_COLUMN_WIDTHS_OPTION : MAX_SCALING_PERCENT;
 
   // fixes migration tables with zero-width columns
   if (zeroWidthColumnsCount > 0) {
@@ -156,7 +157,8 @@ export var Colgroup = function Colgroup(props) {
     return null;
   }
   var colStyles = renderScaleDownColgroup(_objectSpread(_objectSpread({}, props), {}, {
-    isTableScalingEnabled: !!(flags && 'tablePreserveWidth' in flags && flags.tablePreserveWidth)
+    isTableScalingEnabled: !!(flags && 'tablePreserveWidth' in flags && flags.tablePreserveWidth),
+    isTableFixedColumnWidthsOptionEnabled: !!(flags && 'tableWithFixedColumnWidthsOption' in flags && flags.tableWithFixedColumnWidthsOption)
   }));
   if (!colStyles) {
     return null;

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

@@ -47,7 +47,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.32.1";
+var packageVersion = "109.32.3";
 export var defaultNodeComponents = nodeToReact;
 export var Renderer = /*#__PURE__*/function (_PureComponent) {
   _inherits(Renderer, _PureComponent);

package/dist/esm/ui/annotations/selection/mounter.js

@@ -4,6 +4,7 @@ import { AnnotationTypes } from '@atlaskit/adf-schema';
 import { updateWindowSelectionAroundDraft } from '../draft';
 import { FabricChannel } from '@atlaskit/analytics-listeners';
 import { ACTION, ACTION_SUBJECT, EVENT_TYPE, ACTION_SUBJECT_ID } from '@atlaskit/editor-common/analytics';
+import { getRendererRangeInlineNodeNames } from '../../../actions/get-renderer-range-inline-node-names';
 import { RendererContext as ActionsContext } from '../../RendererActionsContext';
 import { ProvidersContext } from '../context';
 export var SelectionInlineCommentMounter = /*#__PURE__*/React.memo(function (props) {
@@ -48,7 +49,12 @@ export var SelectionInlineCommentMounter = /*#__PURE__*/React.memo(function (pro
         action: ACTION.INSERTED,
         actionSubject: ACTION_SUBJECT.ANNOTATION,
         actionSubjectId: ACTION_SUBJECT_ID.INLINE_COMMENT,
-        attributes: {},
+        attributes: {
+          inlineNodeNames: getRendererRangeInlineNodeNames({
+            pos: positionToAnnotate,
+            actions: actions
+          })
+        },
         eventType: EVENT_TYPE.TRACK
       }).fire(FabricChannel.editor);
     }
@@ -71,7 +77,12 @@ export var SelectionInlineCommentMounter = /*#__PURE__*/React.memo(function (pro
           action: ACTION.CREATE_NOT_ALLOWED,
           actionSubject: ACTION_SUBJECT.ANNOTATION,
           actionSubjectId: ACTION_SUBJECT_ID.INLINE_COMMENT,
-          attributes: {},
+          attributes: {
+            inlineNodeNames: getRendererRangeInlineNodeNames({
+              pos: documentPosition,
+              actions: actions
+            })
+          },
           eventType: EVENT_TYPE.TRACK
         }).fire(FabricChannel.editor);
       }
@@ -87,7 +98,11 @@ export var SelectionInlineCommentMounter = /*#__PURE__*/React.memo(function (pro
         actionSubjectId: ACTION_SUBJECT_ID.INLINE_COMMENT,
         eventType: EVENT_TYPE.TRACK,
         attributes: {
-          overlap: uniqueAnnotationsInRange.length
+          overlap: uniqueAnnotationsInRange.length,
+          inlineNodeNames: getRendererRangeInlineNodeNames({
+            pos: documentPosition,
+            actions: actions
+          })
         }
       }).fire(FabricChannel.editor);
     }
@@ -126,12 +141,17 @@ export var SelectionInlineCommentMounter = /*#__PURE__*/React.memo(function (pro
         actionSubject: ACTION_SUBJECT.ANNOTATION,
         actionSubjectId: ACTION_SUBJECT_ID.INLINE_COMMENT,
         eventType: EVENT_TYPE.TRACK,
-        attributes: {}
+        attributes: {
+          inlineNodeNames: getRendererRangeInlineNodeNames({
+            pos: documentPosition,
+            actions: actions
+          })
+        }
       }).fire(FabricChannel.editor);
     }
     removeDraftModeCallback();
     onCloseProps();
-  }, [onCloseProps, removeDraftModeCallback, createAnalyticsEvent]);
+  }, [actions, documentPosition, onCloseProps, removeDraftModeCallback, createAnalyticsEvent]);
   return /*#__PURE__*/React.createElement(Component, {
     range: range,
     draftRange: draftRange,

package/dist/types/actions/get-renderer-range-inline-node-names.d.ts

@@ -0,0 +1,12 @@
+import type RendererActions from './index';
+export declare function getRendererRangeInlineNodeNames({ actions, pos, }: {
+    actions: RendererActions;
+    /**
+     * documentPosition is caclulated by `actions.getPositionFromRange`
+     * where `false` means that the selection is not able to be calculated.
+     */
+    pos?: {
+        from: number;
+        to: number;
+    } | false;
+}): string[] | undefined;

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

@@ -52,6 +52,9 @@ export default class RendererActions implements RendererActionsOptions, Annotati
     annotate(range: Range, annotationId: string, annotationType: 'inlineComment'): AnnotationActionResult;
     isValidAnnotationRange(range: Range | null): boolean;
     isValidAnnotationPosition(pos: Position): boolean;
+    /**
+     * Note: False indicates that the selection not able to be calculated.
+     */
     getPositionFromRange(range: Range | null, isCommentsOnMediaBugFixEnabled?: boolean, isCommentsOnMediaBugVideoComment?: boolean): Position | false;
     getAnnotationMarks(): Mark[];
     getAnnotationsByPosition(range: Range): string[];

package/dist/types/analytics/events.d.ts

@@ -104,7 +104,9 @@ export type AnnotationDraftAEPAttributes = {
 export type AnnotationResolvedAEPAttributes = {
     method?: RESOLVE_METHOD;
 };
-export type AnnotationDeleteAEP = AEP<AnnotationActionType, ACTION_SUBJECT.ANNOTATION, ACTION_SUBJECT_ID, undefined, EVENT_TYPE.TRACK>;
+export type AnnotationDeleteAEP = AEP<AnnotationActionType, ACTION_SUBJECT.ANNOTATION, ACTION_SUBJECT_ID, {
+    inlineNodeNames?: string[];
+}, EVENT_TYPE.TRACK>;
 export declare enum RESOLVE_METHOD {
     COMPONENT = "component",
     CONSUMER = "consumer",

package/dist/types-ts4.5/actions/get-renderer-range-inline-node-names.d.ts

@@ -0,0 +1,12 @@
+import type RendererActions from './index';
+export declare function getRendererRangeInlineNodeNames({ actions, pos, }: {
+    actions: RendererActions;
+    /**
+     * documentPosition is caclulated by `actions.getPositionFromRange`
+     * where `false` means that the selection is not able to be calculated.
+     */
+    pos?: {
+        from: number;
+        to: number;
+    } | false;
+}): string[] | undefined;

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

@@ -52,6 +52,9 @@ export default class RendererActions implements RendererActionsOptions, Annotati
     annotate(range: Range, annotationId: string, annotationType: 'inlineComment'): AnnotationActionResult;
     isValidAnnotationRange(range: Range | null): boolean;
     isValidAnnotationPosition(pos: Position): boolean;
+    /**
+     * Note: False indicates that the selection not able to be calculated.
+     */
     getPositionFromRange(range: Range | null, isCommentsOnMediaBugFixEnabled?: boolean, isCommentsOnMediaBugVideoComment?: boolean): Position | false;
     getAnnotationMarks(): Mark[];
     getAnnotationsByPosition(range: Range): string[];

package/dist/types-ts4.5/analytics/events.d.ts

@@ -104,7 +104,9 @@ export type AnnotationDraftAEPAttributes = {
 export type AnnotationResolvedAEPAttributes = {
     method?: RESOLVE_METHOD;
 };
-export type AnnotationDeleteAEP = AEP<AnnotationActionType, ACTION_SUBJECT.ANNOTATION, ACTION_SUBJECT_ID, undefined, EVENT_TYPE.TRACK>;
+export type AnnotationDeleteAEP = AEP<AnnotationActionType, ACTION_SUBJECT.ANNOTATION, ACTION_SUBJECT_ID, {
+    inlineNodeNames?: string[];
+}, EVENT_TYPE.TRACK>;
 export declare enum RESOLVE_METHOD {
     COMPONENT = "component",
     CONSUMER = "consumer",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/renderer",
-  "version": "109.32.1",
+  "version": "109.32.3",
   "description": "Renderer component",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -31,7 +31,7 @@
     "@atlaskit/analytics-next": "^9.3.0",
     "@atlaskit/button": "^17.17.0",
     "@atlaskit/code": "^15.2.0",
-    "@atlaskit/editor-common": "^82.2.0",
+    "@atlaskit/editor-common": "^82.3.0",
     "@atlaskit/editor-json-transformer": "^8.13.0",
     "@atlaskit/editor-palette": "1.6.0",
     "@atlaskit/editor-prosemirror": "4.0.1",
@@ -51,7 +51,7 @@
     "@atlaskit/status": "^1.4.0",
     "@atlaskit/task-decision": "^17.10.0",
     "@atlaskit/theme": "^12.9.0",
-    "@atlaskit/tokens": "^1.49.0",
+    "@atlaskit/tokens": "^1.50.0",
     "@atlaskit/tooltip": "^18.4.0",
     "@babel/runtime": "^7.0.0",
     "@emotion/react": "^11.7.1",
@@ -139,9 +139,6 @@
     "platform.editor.scale-table-when-number-column-in-table-resized_y4qh2": {
       "type": "boolean"
     },
-    "platform.editor.table.preserve-widths-with-lock-button": {
-      "type": "boolean"
-    },
     "platform.editor.table.use-increased-scaling-percent": {
       "type": "boolean"
     },