@atlaskit/renderer 109.40.0 → 109.40.1

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @atlaskit/renderer
 
+## 109.40.1
+
+### Patch Changes
+
+- [#116104](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/116104)
+  [`ed6b070c03e93`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/ed6b070c03e93) -
+  [ED-23887] fix issue where invalid range calculations led to renderer crashes.
+
 ## 109.40.0
 
 ### Minor Changes

package/dist/cjs/actions/index.js

@@ -17,6 +17,7 @@ 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");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 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 () {
@@ -165,12 +166,27 @@ var RendererActions = exports.default = /*#__PURE__*/function () {
       if (!range) {
         return false;
       }
+      if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz')) {
+        if (this.isRendererWithinRange(range)) {
+          return false;
+        }
+      }
       var pos = (0, _steps.getPosFromRange)(range);
       if (!pos || !this.doc) {
         return false;
       }
       return this._privateValidatePositionsForAnnotation(pos.from, pos.to);
     }
+  }, {
+    key: "isRendererWithinRange",
+    value: function isRendererWithinRange(range) {
+      var startContainer = range.startContainer,
+        endContainer = range.endContainer;
+      if (startContainer.parentElement && startContainer.parentElement.closest('.ak-renderer-extension') || endContainer.parentElement && endContainer.parentElement.closest('.ak-renderer-extension')) {
+        return true;
+      }
+      return false;
+    }
   }, {
     key: "isValidAnnotationPosition",
     value: function isValidAnnotationPosition(pos) {

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.40.0";
+var packageVersion = "109.40.1";
 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

@@ -38,11 +38,15 @@ var SelectionInlineCommentMounter = exports.SelectionInlineCommentMounter = /*#_
   var providers = (0, _react.useContext)(_context.ProvidersContext);
   var isCommentsOnMediaBugFixEnabled = !!(providers !== null && providers !== void 0 && providers.inlineComment.isCommentsOnMediaBugFixEnabled);
   var inlineNodeTypes = (0, _react.useMemo)(function () {
-    return (0, _getRendererRangeInlineNodeNames.getRendererRangeInlineNodeNames)({
-      pos: documentPosition,
-      actions: actions
-    });
-  }, [documentPosition, actions]);
+    if (actions.isValidAnnotationRange(range)) {
+      return (0, _getRendererRangeInlineNodeNames.getRendererRangeInlineNodeNames)({
+        pos: documentPosition,
+        actions: actions
+      });
+    } else {
+      return undefined;
+    }
+  }, [documentPosition, actions, range]);
   var onCreateCallback = (0, _react.useCallback)(function (annotationId) {
     // We want to support creation on a documentPosition if the user is only using ranges
     // but we want to prioritize draft positions if they are being used by consumers

package/dist/es2019/actions/index.js

@@ -7,6 +7,7 @@ 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';
+import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 export default class RendererActions {
   // Any kind of refence is allowed
 
@@ -143,12 +144,27 @@ export default class RendererActions {
     if (!range) {
       return false;
     }
+    if (getBooleanFF('platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz')) {
+      if (this.isRendererWithinRange(range)) {
+        return false;
+      }
+    }
     const pos = getPosFromRange(range);
     if (!pos || !this.doc) {
       return false;
     }
     return this._privateValidatePositionsForAnnotation(pos.from, pos.to);
   }
+  isRendererWithinRange(range) {
+    const {
+      startContainer,
+      endContainer
+    } = range;
+    if (startContainer.parentElement && startContainer.parentElement.closest('.ak-renderer-extension') || endContainer.parentElement && endContainer.parentElement.closest('.ak-renderer-extension')) {
+      return true;
+    }
+    return false;
+  }
   isValidAnnotationPosition(pos) {
     if (!pos || !this.doc) {
       return false;

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

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

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

@@ -26,11 +26,15 @@ export const SelectionInlineCommentMounter = /*#__PURE__*/React.memo(props => {
   const providers = useContext(ProvidersContext);
   const isCommentsOnMediaBugFixEnabled = !!(providers !== null && providers !== void 0 && providers.inlineComment.isCommentsOnMediaBugFixEnabled);
   const inlineNodeTypes = useMemo(() => {
-    return getRendererRangeInlineNodeNames({
-      pos: documentPosition,
-      actions
-    });
-  }, [documentPosition, actions]);
+    if (actions.isValidAnnotationRange(range)) {
+      return getRendererRangeInlineNodeNames({
+        pos: documentPosition,
+        actions
+      });
+    } else {
+      return undefined;
+    }
+  }, [documentPosition, actions, range]);
   const onCreateCallback = useCallback(annotationId => {
     // We want to support creation on a documentPosition if the user is only using ranges
     // but we want to prioritize draft positions if they are being used by consumers

package/dist/esm/actions/index.js

@@ -12,6 +12,7 @@ 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';
+import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 var RendererActions = /*#__PURE__*/function () {
   // Any kind of refence is allowed
 
@@ -158,12 +159,27 @@ var RendererActions = /*#__PURE__*/function () {
       if (!range) {
         return false;
       }
+      if (getBooleanFF('platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz')) {
+        if (this.isRendererWithinRange(range)) {
+          return false;
+        }
+      }
       var pos = getPosFromRange(range);
       if (!pos || !this.doc) {
         return false;
       }
       return this._privateValidatePositionsForAnnotation(pos.from, pos.to);
     }
+  }, {
+    key: "isRendererWithinRange",
+    value: function isRendererWithinRange(range) {
+      var startContainer = range.startContainer,
+        endContainer = range.endContainer;
+      if (startContainer.parentElement && startContainer.parentElement.closest('.ak-renderer-extension') || endContainer.parentElement && endContainer.parentElement.closest('.ak-renderer-extension')) {
+        return true;
+      }
+      return false;
+    }
   }, {
     key: "isValidAnnotationPosition",
     value: function isValidAnnotationPosition(pos) {

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

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

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

@@ -28,11 +28,15 @@ export var SelectionInlineCommentMounter = /*#__PURE__*/React.memo(function (pro
   var providers = useContext(ProvidersContext);
   var isCommentsOnMediaBugFixEnabled = !!(providers !== null && providers !== void 0 && providers.inlineComment.isCommentsOnMediaBugFixEnabled);
   var inlineNodeTypes = useMemo(function () {
-    return getRendererRangeInlineNodeNames({
-      pos: documentPosition,
-      actions: actions
-    });
-  }, [documentPosition, actions]);
+    if (actions.isValidAnnotationRange(range)) {
+      return getRendererRangeInlineNodeNames({
+        pos: documentPosition,
+        actions: actions
+      });
+    } else {
+      return undefined;
+    }
+  }, [documentPosition, actions, range]);
   var onCreateCallback = useCallback(function (annotationId) {
     // We want to support creation on a documentPosition if the user is only using ranges
     // but we want to prioritize draft positions if they are being used by consumers

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

@@ -51,6 +51,7 @@ export default class RendererActions implements RendererActionsOptions, Annotati
     };
     annotate(range: Range, annotationId: string, annotationType: 'inlineComment'): AnnotationActionResult;
     isValidAnnotationRange(range: Range | null): boolean;
+    isRendererWithinRange(range: Range): boolean;
     isValidAnnotationPosition(pos: Position): boolean;
     /**
      * Note: False indicates that the selection not able to be calculated.

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

@@ -51,6 +51,7 @@ export default class RendererActions implements RendererActionsOptions, Annotati
     };
     annotate(range: Range, annotationId: string, annotationType: 'inlineComment'): AnnotationActionResult;
     isValidAnnotationRange(range: Range | null): boolean;
+    isRendererWithinRange(range: Range): boolean;
     isValidAnnotationPosition(pos: Position): boolean;
     /**
      * Note: False indicates that the selection not able to be calculated.

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/renderer",
-	"version": "109.40.0",
+	"version": "109.40.1",
 	"description": "Renderer component",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -63,7 +63,7 @@
 		"uuid": "^3.1.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/link-provider": "^1.10.0",
+		"@atlaskit/link-provider": "^1.12.0",
 		"@atlaskit/media-core": "^34.2.0",
 		"react": "^16.8.0",
 		"react-dom": "^16.8.0"
@@ -74,7 +74,7 @@
 		"@atlaskit/analytics-gas-types": "^5.1.0",
 		"@atlaskit/css-reset": "^6.9.0",
 		"@atlaskit/editor-test-helpers": "^18.25.0",
-		"@atlaskit/link-provider": "^1.11.0",
+		"@atlaskit/link-provider": "^1.12.0",
 		"@atlaskit/link-test-helpers": "^7.0.0",
 		"@atlaskit/linking-common": "^5.7.0",
 		"@atlaskit/media-core": "^34.2.0",