@atlaskit/renderer 120.3.1 → 120.3.3

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @atlaskit/renderer
 
+## 120.3.3
+
+### Patch Changes
+
+- [#191617](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/191617)
+  [`49f632112178c`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/49f632112178c) -
+  Bugfix - pass path for emojis during renderer serialization to generate correct renderer_start_pos
+- Updated dependencies
+
+## 120.3.2
+
+### Patch Changes
+
+- [#192346](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/192346)
+  [`a2de3fc822824`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/a2de3fc822824) -
+  [JRACLOUD-95277] Modifying experiment name
+- Updated dependencies
+
 ## 120.3.1
 
 ### Patch Changes

package/dist/cjs/react/index.js

@@ -14,6 +14,7 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _react = _interopRequireDefault(require("react"));
 var _model = require("@atlaskit/editor-prosemirror/model");
 var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
+var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _links = require("./utils/links");
 var _nodes = require("./nodes");
 var _textWrapper = _interopRequireDefault(require("./nodes/text-wrapper"));
@@ -230,7 +231,7 @@ var ReactSerializer = exports.default = /*#__PURE__*/function () {
         case 'media':
           return this.getMediaProps(node, path);
         case 'emoji':
-          return this.getEmojiProps(node);
+          return this.getEmojiProps(node, (0, _expValEquals.expValEquals)('cc_comments_include_path_for_renderer_emojis', 'isEnabled', true) ? path : undefined);
         case 'extension':
         case 'bodiedExtension':
           return this.getExtensionProps(node, path);
@@ -506,7 +507,8 @@ var ReactSerializer = exports.default = /*#__PURE__*/function () {
   }, {
     key: "getEmojiProps",
     value: function getEmojiProps(node) {
-      return _objectSpread(_objectSpread({}, this.getProps(node)), {}, {
+      var path = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
+      return _objectSpread(_objectSpread({}, this.getProps(node, path)), {}, {
         resourceConfig: this.emojiResourceConfig
       });
     }

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

@@ -29,7 +29,10 @@ var isTableColumnResized = function isTableColumnResized(columnWidths) {
   });
   return !!filteredWidths.length;
 };
-var fixColumnWidth = function fixColumnWidth(columnWidth, _tableWidth, _layoutWidth, zeroWidthColumnsCount, scaleDownPercent) {
+var fixColumnWidth = function fixColumnWidth(_ref) {
+  var columnWidth = _ref.columnWidth,
+    zeroWidthColumnsCount = _ref.zeroWidthColumnsCount,
+    scaleDownPercent = _ref.scaleDownPercent;
   if (columnWidth === 0) {
     return columnWidth;
   }
@@ -43,11 +46,11 @@ var fixColumnWidth = function fixColumnWidth(columnWidth, _tableWidth, _layoutWi
   // We need to take tableCellBorderWidth, to avoid unnecessary overflow.
   columnWidth - _styles.tableCellBorderWidth, zeroWidthColumnsCount ? _editorSharedStyles.akEditorTableLegacyCellMinWidth : _styles.tableCellMinWidth);
 };
-var calcScalePercent = function calcScalePercent(_ref) {
-  var renderWidth = _ref.renderWidth,
-    tableWidth = _ref.tableWidth,
-    maxScale = _ref.maxScale,
-    isNumberColumnEnabled = _ref.isNumberColumnEnabled;
+var calcScalePercent = function calcScalePercent(_ref2) {
+  var renderWidth = _ref2.renderWidth,
+    tableWidth = _ref2.tableWidth,
+    maxScale = _ref2.maxScale,
+    isNumberColumnEnabled = _ref2.isNumberColumnEnabled;
   var noNumColumnScalePercent = renderWidth / tableWidth;
   // when numbered column is enabled, we need to calculate the scale percent without the akEditorTableNumberColumnWidth
   // As numbered column width is not scaled down
@@ -98,8 +101,8 @@ var renderScaleDownColgroup = function renderScaleDownColgroup(props) {
   var tableContainerWidth = rendererAppearance === 'comment' && !(tableNode !== null && tableNode !== void 0 && tableNode.attrs.width) || isRendererNested && (!(0, _platformFeatureFlags.fg)('platform_fix_nested_num_column_scaling') || !isNumberColumnEnabled) ? renderWidth : (0, _nodeWidth.getTableContainerWidth)(tableNode);
   if (allowTableResizing && !isInsideOfBlockNode && !isInsideOfTable && !isinsideMultiBodiedExtension && !tableColumnResized) {
     // when no columns are resized, each column should have equal width, equals to tableWidth / noOfColumns
-    var _tableWidth2 = (isNumberColumnEnabled ? tableContainerWidth - _editorSharedStyles.akEditorTableNumberColumnWidth : tableContainerWidth) - 1;
-    var defaultColumnWidth = _tableWidth2 / noOfColumns;
+    var _tableWidth = (isNumberColumnEnabled ? tableContainerWidth - _editorSharedStyles.akEditorTableNumberColumnWidth : tableContainerWidth) - 1;
+    var defaultColumnWidth = _tableWidth / noOfColumns;
     targetWidths = new Array(noOfColumns).fill(defaultColumnWidth);
   } else if (!tableColumnResized) {
     return null;
@@ -175,9 +178,13 @@ var renderScaleDownColgroup = function renderScaleDownColgroup(props) {
       isNumberColumnEnabled: isNumberColumnEnabled
     });
   }
-  if (isNumberColumnEnabled && (tableWidth < maxTableWidth || maxTableWidth === 0) && (0, _expValEquals.expValEquals)('editor_prevent_numbered_column_too_big_jira', 'isEnabled', true)) {
+  if (isNumberColumnEnabled && (tableWidth < maxTableWidth || maxTableWidth === 0) && (0, _expValEquals.expValEquals)('editor_prevent_numbered_column_too_big_jira_1', 'isEnabled', true)) {
     var fixedColWidths = targetWidths.map(function (width) {
-      return fixColumnWidth(width, tableWidth, maxTableWidth, zeroWidthColumnsCount, scaleDownPercent) || cellMinWidth;
+      return fixColumnWidth({
+        columnWidth: width,
+        zeroWidthColumnsCount: zeroWidthColumnsCount,
+        scaleDownPercent: scaleDownPercent
+      }) || cellMinWidth;
     });
     var sumFixedColumnWidths = colWidthSum(fixedColWidths);
     return fixedColWidths.map(function (colWidth) {
@@ -201,11 +208,15 @@ var renderScaleDownColgroup = function renderScaleDownColgroup(props) {
   }
 
   /**
-   * When cleaning up editor_prevent_numbered_column_too_big_jira experiment,
+   * When cleaning up editor_prevent_numbered_column_too_big_jira_1 experiment,
    * resuse the fixedColWidths const to avoid code duplication.
    */
   return targetWidths.map(function (colWidth) {
-    var width = fixColumnWidth(colWidth, minTableWidth, maxTableWidth, zeroWidthColumnsCount, scaleDownPercent) || cellMinWidth;
+    var width = fixColumnWidth({
+      columnWidth: colWidth,
+      zeroWidthColumnsCount: zeroWidthColumnsCount,
+      scaleDownPercent: scaleDownPercent
+    }) || cellMinWidth;
     var style = width ? {
       width: "".concat(width, "px")
     } : {};

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

@@ -63,7 +63,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 var NORMAL_SEVERITY_THRESHOLD = exports.NORMAL_SEVERITY_THRESHOLD = 2000;
 var DEGRADED_SEVERITY_THRESHOLD = exports.DEGRADED_SEVERITY_THRESHOLD = 3000;
 var packageName = "@atlaskit/renderer";
-var packageVersion = "120.3.0";
+var packageVersion = "120.3.2";
 var setAsQueryContainerStyles = (0, _react2.css)({
   containerName: 'ak-renderer-wrapper',
   containerType: 'inline-size'

package/dist/es2019/react/index.js

@@ -3,6 +3,7 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import React from 'react';
 import { MarkType } from '@atlaskit/editor-prosemirror/model';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { isNestedHeaderLinksEnabled } from './utils/links';
 import { Doc, DocWithSelectAllTrap, mergeTextNodes, isTextWrapper, isTextNode, toReact } from './nodes';
 import TextWrapperComponent from './nodes/text-wrapper';
@@ -212,7 +213,7 @@ export default class ReactSerializer {
       case 'media':
         return this.getMediaProps(node, path);
       case 'emoji':
-        return this.getEmojiProps(node);
+        return this.getEmojiProps(node, expValEquals('cc_comments_include_path_for_renderer_emojis', 'isEnabled', true) ? path : undefined);
       case 'extension':
       case 'bodiedExtension':
         return this.getExtensionProps(node, path);
@@ -455,9 +456,9 @@ export default class ReactSerializer {
       nodeHeight: (_this$getExtensionHei = this.getExtensionHeight) === null || _this$getExtensionHei === void 0 ? void 0 : _this$getExtensionHei.call(this, node)
     };
   }
-  getEmojiProps(node) {
+  getEmojiProps(node, path = []) {
     return {
-      ...this.getProps(node),
+      ...this.getProps(node, path),
       resourceConfig: this.emojiResourceConfig
     };
   }

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

@@ -18,7 +18,11 @@ const isTableColumnResized = columnWidths => {
   const filteredWidths = columnWidths.filter(width => width !== 0);
   return !!filteredWidths.length;
 };
-const fixColumnWidth = (columnWidth, _tableWidth, _layoutWidth, zeroWidthColumnsCount, scaleDownPercent) => {
+const fixColumnWidth = ({
+  columnWidth,
+  zeroWidthColumnsCount,
+  scaleDownPercent
+}) => {
   if (columnWidth === 0) {
     return columnWidth;
   }
@@ -161,8 +165,12 @@ const renderScaleDownColgroup = props => {
       isNumberColumnEnabled: isNumberColumnEnabled
     });
   }
-  if (isNumberColumnEnabled && (tableWidth < maxTableWidth || maxTableWidth === 0) && expValEquals('editor_prevent_numbered_column_too_big_jira', 'isEnabled', true)) {
-    const fixedColWidths = targetWidths.map(width => fixColumnWidth(width, tableWidth, maxTableWidth, zeroWidthColumnsCount, scaleDownPercent) || cellMinWidth);
+  if (isNumberColumnEnabled && (tableWidth < maxTableWidth || maxTableWidth === 0) && expValEquals('editor_prevent_numbered_column_too_big_jira_1', 'isEnabled', true)) {
+    const fixedColWidths = targetWidths.map(width => fixColumnWidth({
+      columnWidth: width,
+      zeroWidthColumnsCount,
+      scaleDownPercent
+    }) || cellMinWidth);
     const sumFixedColumnWidths = colWidthSum(fixedColWidths);
     return fixedColWidths.map(colWidth => {
       const width = Math.max(colWidth, cellMinWidth);
@@ -185,11 +193,15 @@ const renderScaleDownColgroup = props => {
   }
 
   /**
-   * When cleaning up editor_prevent_numbered_column_too_big_jira experiment,
+   * When cleaning up editor_prevent_numbered_column_too_big_jira_1 experiment,
    * resuse the fixedColWidths const to avoid code duplication.
    */
   return targetWidths.map(colWidth => {
-    const width = fixColumnWidth(colWidth, minTableWidth, maxTableWidth, zeroWidthColumnsCount, scaleDownPercent) || cellMinWidth;
+    const width = fixColumnWidth({
+      columnWidth: colWidth,
+      zeroWidthColumnsCount,
+      scaleDownPercent
+    }) || cellMinWidth;
     const style = width ? {
       width: `${width}px`
     } : {};

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

@@ -49,7 +49,7 @@ import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equ
 export const NORMAL_SEVERITY_THRESHOLD = 2000;
 export const DEGRADED_SEVERITY_THRESHOLD = 3000;
 const packageName = "@atlaskit/renderer";
-const packageVersion = "120.3.0";
+const packageVersion = "120.3.2";
 const setAsQueryContainerStyles = css({
   containerName: 'ak-renderer-wrapper',
   containerType: 'inline-size'

package/dist/esm/react/index.js

@@ -10,6 +10,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 import React from 'react';
 import { MarkType } from '@atlaskit/editor-prosemirror/model';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { isNestedHeaderLinksEnabled } from './utils/links';
 import { Doc, DocWithSelectAllTrap, mergeTextNodes, isTextWrapper, isTextNode, toReact } from './nodes';
 import TextWrapperComponent from './nodes/text-wrapper';
@@ -223,7 +224,7 @@ var ReactSerializer = /*#__PURE__*/function () {
         case 'media':
           return this.getMediaProps(node, path);
         case 'emoji':
-          return this.getEmojiProps(node);
+          return this.getEmojiProps(node, expValEquals('cc_comments_include_path_for_renderer_emojis', 'isEnabled', true) ? path : undefined);
         case 'extension':
         case 'bodiedExtension':
           return this.getExtensionProps(node, path);
@@ -499,7 +500,8 @@ var ReactSerializer = /*#__PURE__*/function () {
   }, {
     key: "getEmojiProps",
     value: function getEmojiProps(node) {
-      return _objectSpread(_objectSpread({}, this.getProps(node)), {}, {
+      var path = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
+      return _objectSpread(_objectSpread({}, this.getProps(node, path)), {}, {
         resourceConfig: this.emojiResourceConfig
       });
     }

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

@@ -23,7 +23,10 @@ var isTableColumnResized = function isTableColumnResized(columnWidths) {
   });
   return !!filteredWidths.length;
 };
-var fixColumnWidth = function fixColumnWidth(columnWidth, _tableWidth, _layoutWidth, zeroWidthColumnsCount, scaleDownPercent) {
+var fixColumnWidth = function fixColumnWidth(_ref) {
+  var columnWidth = _ref.columnWidth,
+    zeroWidthColumnsCount = _ref.zeroWidthColumnsCount,
+    scaleDownPercent = _ref.scaleDownPercent;
   if (columnWidth === 0) {
     return columnWidth;
   }
@@ -37,11 +40,11 @@ var fixColumnWidth = function fixColumnWidth(columnWidth, _tableWidth, _layoutWi
   // We need to take tableCellBorderWidth, to avoid unnecessary overflow.
   columnWidth - tableCellBorderWidth, zeroWidthColumnsCount ? akEditorTableLegacyCellMinWidth : tableCellMinWidth);
 };
-var calcScalePercent = function calcScalePercent(_ref) {
-  var renderWidth = _ref.renderWidth,
-    tableWidth = _ref.tableWidth,
-    maxScale = _ref.maxScale,
-    isNumberColumnEnabled = _ref.isNumberColumnEnabled;
+var calcScalePercent = function calcScalePercent(_ref2) {
+  var renderWidth = _ref2.renderWidth,
+    tableWidth = _ref2.tableWidth,
+    maxScale = _ref2.maxScale,
+    isNumberColumnEnabled = _ref2.isNumberColumnEnabled;
   var noNumColumnScalePercent = renderWidth / tableWidth;
   // when numbered column is enabled, we need to calculate the scale percent without the akEditorTableNumberColumnWidth
   // As numbered column width is not scaled down
@@ -92,8 +95,8 @@ var renderScaleDownColgroup = function renderScaleDownColgroup(props) {
   var tableContainerWidth = rendererAppearance === 'comment' && !(tableNode !== null && tableNode !== void 0 && tableNode.attrs.width) || isRendererNested && (!fg('platform_fix_nested_num_column_scaling') || !isNumberColumnEnabled) ? renderWidth : getTableContainerWidth(tableNode);
   if (allowTableResizing && !isInsideOfBlockNode && !isInsideOfTable && !isinsideMultiBodiedExtension && !tableColumnResized) {
     // when no columns are resized, each column should have equal width, equals to tableWidth / noOfColumns
-    var _tableWidth2 = (isNumberColumnEnabled ? tableContainerWidth - akEditorTableNumberColumnWidth : tableContainerWidth) - 1;
-    var defaultColumnWidth = _tableWidth2 / noOfColumns;
+    var _tableWidth = (isNumberColumnEnabled ? tableContainerWidth - akEditorTableNumberColumnWidth : tableContainerWidth) - 1;
+    var defaultColumnWidth = _tableWidth / noOfColumns;
     targetWidths = new Array(noOfColumns).fill(defaultColumnWidth);
   } else if (!tableColumnResized) {
     return null;
@@ -169,9 +172,13 @@ var renderScaleDownColgroup = function renderScaleDownColgroup(props) {
       isNumberColumnEnabled: isNumberColumnEnabled
     });
   }
-  if (isNumberColumnEnabled && (tableWidth < maxTableWidth || maxTableWidth === 0) && expValEquals('editor_prevent_numbered_column_too_big_jira', 'isEnabled', true)) {
+  if (isNumberColumnEnabled && (tableWidth < maxTableWidth || maxTableWidth === 0) && expValEquals('editor_prevent_numbered_column_too_big_jira_1', 'isEnabled', true)) {
     var fixedColWidths = targetWidths.map(function (width) {
-      return fixColumnWidth(width, tableWidth, maxTableWidth, zeroWidthColumnsCount, scaleDownPercent) || cellMinWidth;
+      return fixColumnWidth({
+        columnWidth: width,
+        zeroWidthColumnsCount: zeroWidthColumnsCount,
+        scaleDownPercent: scaleDownPercent
+      }) || cellMinWidth;
     });
     var sumFixedColumnWidths = colWidthSum(fixedColWidths);
     return fixedColWidths.map(function (colWidth) {
@@ -195,11 +202,15 @@ var renderScaleDownColgroup = function renderScaleDownColgroup(props) {
   }
 
   /**
-   * When cleaning up editor_prevent_numbered_column_too_big_jira experiment,
+   * When cleaning up editor_prevent_numbered_column_too_big_jira_1 experiment,
    * resuse the fixedColWidths const to avoid code duplication.
    */
   return targetWidths.map(function (colWidth) {
-    var width = fixColumnWidth(colWidth, minTableWidth, maxTableWidth, zeroWidthColumnsCount, scaleDownPercent) || cellMinWidth;
+    var width = fixColumnWidth({
+      columnWidth: colWidth,
+      zeroWidthColumnsCount: zeroWidthColumnsCount,
+      scaleDownPercent: scaleDownPercent
+    }) || cellMinWidth;
     var style = width ? {
       width: "".concat(width, "px")
     } : {};

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

@@ -54,7 +54,7 @@ import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equ
 export var NORMAL_SEVERITY_THRESHOLD = 2000;
 export var DEGRADED_SEVERITY_THRESHOLD = 3000;
 var packageName = "@atlaskit/renderer";
-var packageVersion = "120.3.0";
+var packageVersion = "120.3.2";
 var setAsQueryContainerStyles = css({
   containerName: 'ak-renderer-wrapper',
   containerType: 'inline-size'

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/renderer",
-	"version": "120.3.1",
+	"version": "120.3.3",
 	"description": "Renderer component",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -39,7 +39,7 @@
 		"@atlaskit/feature-gate-js-client": "^5.5.0",
 		"@atlaskit/icon": "^27.7.0",
 		"@atlaskit/link": "^3.2.0",
-		"@atlaskit/link-datasource": "^4.15.0",
+		"@atlaskit/link-datasource": "^4.16.0",
 		"@atlaskit/media-card": "^79.4.0",
 		"@atlaskit/media-client": "^35.2.0",
 		"@atlaskit/media-client-react": "^4.1.0",
@@ -54,9 +54,9 @@
 		"@atlaskit/status": "^3.0.0",
 		"@atlaskit/task-decision": "^19.2.0",
 		"@atlaskit/theme": "^19.0.0",
-		"@atlaskit/tmp-editor-statsig": "^9.15.0",
+		"@atlaskit/tmp-editor-statsig": "^9.17.0",
 		"@atlaskit/tokens": "^5.6.0",
-		"@atlaskit/tooltip": "^20.3.0",
+		"@atlaskit/tooltip": "^20.4.0",
 		"@atlaskit/visually-hidden": "^3.0.0",
 		"@babel/runtime": "^7.0.0",
 		"@emotion/react": "^11.7.1",
@@ -81,7 +81,7 @@
 		"@atlaskit/checkbox": "^17.1.0",
 		"@atlaskit/css-reset": "^7.3.0",
 		"@atlaskit/link-provider": "^3.4.0",
-		"@atlaskit/link-test-helpers": "^8.2.0",
+		"@atlaskit/link-test-helpers": "^8.3.0",
 		"@atlaskit/linking-common": "^9.2.0",
 		"@atlaskit/media-core": "^37.0.0",
 		"@atlaskit/media-integration-test-helpers": "workspace:^",