@atlaskit/renderer 120.2.1 → 120.2.3

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @atlaskit/renderer
 
+## 120.2.3
+
+### Patch Changes
+
+- [#187434](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/187434)
+  [`32a92d196a307`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/32a92d196a307) -
+  Removes fg cc_complexit_fe_reduce_rerender_2
+
+## 120.2.2
+
+### Patch Changes
+
+- [#188983](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/188983)
+  [`4db0e4a06b450`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/4db0e4a06b450) -
+  EDITOR-1122: Fix telepointer not updating when childList is mutated instead of characterData.
+  Behind platform_editor_ai_iw_adf_streaming
+- Updated dependencies
+
 ## 120.2.1
 
 ### Patch Changes

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

@@ -51,6 +51,7 @@ var _getBaseFontSize = require("./get-base-font-size");
 var _rendererHelper = require("./rendererHelper");
 var _useMemoFromPropsDerivative = require("./useMemoFromPropsDerivative");
 var _PortalContext = require("./PortalContext");
+var _expValEqualsNoExposure = require("@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure");
 var _excluded = ["portal"];
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 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; }
@@ -62,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.2.0";
+var packageVersion = "120.2.2";
 var setAsQueryContainerStyles = (0, _react2.css)({
   containerName: 'ak-renderer-wrapper',
   containerType: 'inline-size'
@@ -501,9 +502,7 @@ function Renderer(props) {
     // eslint-disable-next-line @atlaskit/platform/ensure-feature-flag-prefix
     (0, _platformFeatureFlags.fg)('issue_table_single_line_row_height_fast_follows') ? (_props$isTopLevelRend = props.isTopLevelRenderer) !== null && _props$isTopLevelRend !== void 0 ? _props$isTopLevelRend : isTopLevelRenderer : isTopLevelRenderer,
     skipValidation: skipValidation,
-    validationOverrides: (0, _platformFeatureFlags.fg)('cc_complexit_fe_reduce_rerender_2') ? validationOverrides : {
-      allowNestedTables: allowNestedTables
-    }
+    validationOverrides: validationOverrides
   }));
 }
 
@@ -570,7 +569,8 @@ var RendererWrapper = /*#__PURE__*/_react.default.memo(function (props) {
         lastChild && lastChild.appendChild(createTelepointer());
       }
       var mutateTelepointer = function mutateTelepointer(mutations) {
-        mutations.forEach(function (mutation) {
+        mutations.forEach(function (mutation, index) {
+          var _mutation$addedNodes$, _mutation$removedNode;
           if (initialUpdate.current) {
             var oldTelepointer = _renderer.querySelector("#".concat(_style.TELEPOINTER_ID));
             if (oldTelepointer) {
@@ -592,6 +592,33 @@ var RendererWrapper = /*#__PURE__*/_react.default.memo(function (props) {
               parentNode.appendChild(createTelepointer());
             }
           }
+
+          /**
+           * When streaming ADF content, we may receive mutations where nodes get
+           * replaced, rather than have characterData updated.
+           *
+           * Telepointer changes will also cause a childList mutation, so we manually ignore it.
+           * Telepointer changes are always a singular node-adds or node-removes.
+           */
+          if ((0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_ai_iw_adf_streaming', 'isEnabled', true) && mutation.type === 'childList' && !(mutation.addedNodes.length === 1 && ((_mutation$addedNodes$ = mutation.addedNodes[0]) === null || _mutation$addedNodes$ === void 0 ? void 0 : _mutation$addedNodes$.id) === _style.TELEPOINTER_ID || mutation.removedNodes.length === 1 && ((_mutation$removedNode = mutation.removedNodes[0]) === null || _mutation$removedNode === void 0 ? void 0 : _mutation$removedNode.id) === _style.TELEPOINTER_ID)) {
+            var _lastChild2 = _renderer.lastChild;
+            if (_lastChild2) {
+              /**
+               * We want to place telepointer inside content (which has data-renderer-start-pos) and
+               * inside lines in codeblocks (which have data-ds--code--row).
+               */
+              var contentElements = _lastChild2.querySelectorAll('[data-renderer-start-pos],[data-ds--code--row]');
+              var lastElement = contentElements[contentElements.length - 1];
+              var _oldTelepointer2 = _renderer.querySelector("#".concat(_style.TELEPOINTER_ID));
+              if (lastElement) {
+                _oldTelepointer2 === null || _oldTelepointer2 === void 0 || _oldTelepointer2.remove();
+                lastElement === null || lastElement === void 0 || lastElement.appendChild(createTelepointer());
+              } else {
+                _oldTelepointer2 === null || _oldTelepointer2 === void 0 || _oldTelepointer2.remove();
+                _lastChild2 === null || _lastChild2 === void 0 || _lastChild2.appendChild(createTelepointer());
+              }
+            }
+          }
         });
       };
       var observer = new MutationObserver(mutateTelepointer);

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

@@ -45,10 +45,11 @@ import { getBaseFontSize } from './get-base-font-size';
 import { removeEmptySpaceAroundContent } from './rendererHelper';
 import { useMemoFromPropsDerivative } from './useMemoFromPropsDerivative';
 import { PortalContext } from './PortalContext';
+import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
 export const NORMAL_SEVERITY_THRESHOLD = 2000;
 export const DEGRADED_SEVERITY_THRESHOLD = 3000;
 const packageName = "@atlaskit/renderer";
-const packageVersion = "120.2.0";
+const packageVersion = "120.2.2";
 const setAsQueryContainerStyles = css({
   containerName: 'ak-renderer-wrapper',
   containerType: 'inline-size'
@@ -487,9 +488,7 @@ export function Renderer(props) {
     // eslint-disable-next-line @atlaskit/platform/ensure-feature-flag-prefix
     fg('issue_table_single_line_row_height_fast_follows') ? (_props$isTopLevelRend = props.isTopLevelRenderer) !== null && _props$isTopLevelRend !== void 0 ? _props$isTopLevelRend : isTopLevelRenderer : isTopLevelRenderer,
     skipValidation: skipValidation,
-    validationOverrides: fg('cc_complexit_fe_reduce_rerender_2') ? validationOverrides : {
-      allowNestedTables
-    }
+    validationOverrides: validationOverrides
   }));
 }
 
@@ -556,7 +555,8 @@ const RendererWrapper = /*#__PURE__*/React.memo(props => {
         lastChild && lastChild.appendChild(createTelepointer());
       }
       const mutateTelepointer = mutations => {
-        mutations.forEach(mutation => {
+        mutations.forEach((mutation, index) => {
+          var _mutation$addedNodes$, _mutation$removedNode;
           if (initialUpdate.current) {
             const oldTelepointer = renderer.querySelector(`#${TELEPOINTER_ID}`);
             if (oldTelepointer) {
@@ -578,6 +578,33 @@ const RendererWrapper = /*#__PURE__*/React.memo(props => {
               parentNode.appendChild(createTelepointer());
             }
           }
+
+          /**
+           * When streaming ADF content, we may receive mutations where nodes get
+           * replaced, rather than have characterData updated.
+           *
+           * Telepointer changes will also cause a childList mutation, so we manually ignore it.
+           * Telepointer changes are always a singular node-adds or node-removes.
+           */
+          if (expValEqualsNoExposure('platform_editor_ai_iw_adf_streaming', 'isEnabled', true) && mutation.type === 'childList' && !(mutation.addedNodes.length === 1 && ((_mutation$addedNodes$ = mutation.addedNodes[0]) === null || _mutation$addedNodes$ === void 0 ? void 0 : _mutation$addedNodes$.id) === TELEPOINTER_ID || mutation.removedNodes.length === 1 && ((_mutation$removedNode = mutation.removedNodes[0]) === null || _mutation$removedNode === void 0 ? void 0 : _mutation$removedNode.id) === TELEPOINTER_ID)) {
+            const lastChild = renderer.lastChild;
+            if (lastChild) {
+              /**
+               * We want to place telepointer inside content (which has data-renderer-start-pos) and
+               * inside lines in codeblocks (which have data-ds--code--row).
+               */
+              const contentElements = lastChild.querySelectorAll('[data-renderer-start-pos],[data-ds--code--row]');
+              const lastElement = contentElements[contentElements.length - 1];
+              const oldTelepointer = renderer.querySelector(`#${TELEPOINTER_ID}`);
+              if (lastElement) {
+                oldTelepointer === null || oldTelepointer === void 0 ? void 0 : oldTelepointer.remove();
+                lastElement === null || lastElement === void 0 ? void 0 : lastElement.appendChild(createTelepointer());
+              } else {
+                oldTelepointer === null || oldTelepointer === void 0 ? void 0 : oldTelepointer.remove();
+                lastChild === null || lastChild === void 0 ? void 0 : lastChild.appendChild(createTelepointer());
+              }
+            }
+          }
         });
       };
       const observer = new MutationObserver(mutateTelepointer);

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

@@ -50,10 +50,11 @@ import { getBaseFontSize } from './get-base-font-size';
 import { removeEmptySpaceAroundContent } from './rendererHelper';
 import { useMemoFromPropsDerivative } from './useMemoFromPropsDerivative';
 import { PortalContext } from './PortalContext';
+import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
 export var NORMAL_SEVERITY_THRESHOLD = 2000;
 export var DEGRADED_SEVERITY_THRESHOLD = 3000;
 var packageName = "@atlaskit/renderer";
-var packageVersion = "120.2.0";
+var packageVersion = "120.2.2";
 var setAsQueryContainerStyles = css({
   containerName: 'ak-renderer-wrapper',
   containerType: 'inline-size'
@@ -492,9 +493,7 @@ export function Renderer(props) {
     // eslint-disable-next-line @atlaskit/platform/ensure-feature-flag-prefix
     fg('issue_table_single_line_row_height_fast_follows') ? (_props$isTopLevelRend = props.isTopLevelRenderer) !== null && _props$isTopLevelRend !== void 0 ? _props$isTopLevelRend : isTopLevelRenderer : isTopLevelRenderer,
     skipValidation: skipValidation,
-    validationOverrides: fg('cc_complexit_fe_reduce_rerender_2') ? validationOverrides : {
-      allowNestedTables: allowNestedTables
-    }
+    validationOverrides: validationOverrides
   }));
 }
 
@@ -561,7 +560,8 @@ var RendererWrapper = /*#__PURE__*/React.memo(function (props) {
         lastChild && lastChild.appendChild(createTelepointer());
       }
       var mutateTelepointer = function mutateTelepointer(mutations) {
-        mutations.forEach(function (mutation) {
+        mutations.forEach(function (mutation, index) {
+          var _mutation$addedNodes$, _mutation$removedNode;
           if (initialUpdate.current) {
             var oldTelepointer = _renderer.querySelector("#".concat(TELEPOINTER_ID));
             if (oldTelepointer) {
@@ -583,6 +583,33 @@ var RendererWrapper = /*#__PURE__*/React.memo(function (props) {
               parentNode.appendChild(createTelepointer());
             }
           }
+
+          /**
+           * When streaming ADF content, we may receive mutations where nodes get
+           * replaced, rather than have characterData updated.
+           *
+           * Telepointer changes will also cause a childList mutation, so we manually ignore it.
+           * Telepointer changes are always a singular node-adds or node-removes.
+           */
+          if (expValEqualsNoExposure('platform_editor_ai_iw_adf_streaming', 'isEnabled', true) && mutation.type === 'childList' && !(mutation.addedNodes.length === 1 && ((_mutation$addedNodes$ = mutation.addedNodes[0]) === null || _mutation$addedNodes$ === void 0 ? void 0 : _mutation$addedNodes$.id) === TELEPOINTER_ID || mutation.removedNodes.length === 1 && ((_mutation$removedNode = mutation.removedNodes[0]) === null || _mutation$removedNode === void 0 ? void 0 : _mutation$removedNode.id) === TELEPOINTER_ID)) {
+            var _lastChild2 = _renderer.lastChild;
+            if (_lastChild2) {
+              /**
+               * We want to place telepointer inside content (which has data-renderer-start-pos) and
+               * inside lines in codeblocks (which have data-ds--code--row).
+               */
+              var contentElements = _lastChild2.querySelectorAll('[data-renderer-start-pos],[data-ds--code--row]');
+              var lastElement = contentElements[contentElements.length - 1];
+              var _oldTelepointer2 = _renderer.querySelector("#".concat(TELEPOINTER_ID));
+              if (lastElement) {
+                _oldTelepointer2 === null || _oldTelepointer2 === void 0 || _oldTelepointer2.remove();
+                lastElement === null || lastElement === void 0 || lastElement.appendChild(createTelepointer());
+              } else {
+                _oldTelepointer2 === null || _oldTelepointer2 === void 0 || _oldTelepointer2.remove();
+                _lastChild2 === null || _lastChild2 === void 0 || _lastChild2.appendChild(createTelepointer());
+              }
+            }
+          }
         });
       };
       var observer = new MutationObserver(mutateTelepointer);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/renderer",
-	"version": "120.2.1",
+	"version": "120.2.3",
 	"description": "Renderer component",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -68,7 +68,7 @@
 		"uuid": "^3.1.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^107.10.0",
+		"@atlaskit/editor-common": "^107.12.0",
 		"@atlaskit/link-provider": "^3.4.0",
 		"@atlaskit/media-core": "^37.0.0",
 		"react": "^18.2.0",
@@ -139,9 +139,6 @@
 		"platform_fix_nested_num_column_scaling": {
 			"type": "boolean"
 		},
-		"cc_complexit_fe_reduce_rerender_2": {
-			"type": "boolean"
-		},
 		"platform_editor_annotation_position_comment_nodes": {
 			"type": "boolean"
 		},