@atlaskit/renderer 109.25.4 → 109.25.5

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @atlaskit/renderer
 
+## 109.25.5
+
+### Patch Changes
+
+-   [#98978](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/98978)
+    [`b0e975e054e4`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/b0e975e054e4) -
+    FF to fix comments on video
+
 ## 109.25.4
 
 ### Patch Changes

package/dist/cjs/actions/index.js

@@ -171,11 +171,11 @@ var RendererActions = exports.default = /*#__PURE__*/function () {
     }
   }, {
     key: "getPositionFromRange",
-    value: function getPositionFromRange(range, isCommentsOnMediaBugFixEnabled) {
+    value: function getPositionFromRange(range, isCommentsOnMediaBugFixEnabled, isCommentsOnMediaBugVideoComment) {
       if (!this.doc || !this.schema || !range) {
         return false;
       }
-      return (0, _steps.getPosFromRange)(range, isCommentsOnMediaBugFixEnabled);
+      return (0, _steps.getPosFromRange)(range, isCommentsOnMediaBugFixEnabled, isCommentsOnMediaBugVideoComment);
     }
   }, {
     key: "getAnnotationMarks",
@@ -220,7 +220,7 @@ var RendererActions = exports.default = /*#__PURE__*/function () {
     }
   }, {
     key: "applyAnnotation",
-    value: function applyAnnotation(pos, annotation, isCommentsOnMediaBugFixEnabled) {
+    value: function applyAnnotation(pos, annotation, isCommentsOnMediaBugFixEnabled, isCommentsOnMediaBugVideoCommentEnabled) {
       if (!this.doc || !pos || !this.schema) {
         return false;
       }

package/dist/cjs/steps/index.js

@@ -173,27 +173,45 @@ function resolvePos(node, offset) {
   }
   return resolvedPos + offset;
 }
-function getPosFromRange(range, isCommentsOnMediaBugFixEnabled) {
+function getPosFromRange(range, isCommentsOnMediaBugFixEnabled, isCommentsOnMediaBugVideoCommentEnabled) {
   var startContainer = range.startContainer,
     startOffset = range.startOffset,
     endContainer = range.endContainer,
     endOffset = range.endOffset;
-  var possibleMediaElement = findParent(startContainer);
-  if (possibleMediaElement && getNodeType(possibleMediaElement) === 'media') {
-    var pos;
-    if (isCommentsOnMediaBugFixEnabled) {
-      var mediaSingleElement = findMediaParent(possibleMediaElement);
+  var possibleMediaOrMediaSingleElement = findParent(startContainer);
+  if (isCommentsOnMediaBugVideoCommentEnabled) {
+    // Video hover targets return media single, not media, thus, the extra check in condition.
+    var isMediaOrMediaSingle = possibleMediaOrMediaSingleElement && /media|mediaSingle/.test(getNodeType(possibleMediaOrMediaSingleElement) || '');
+    if (isMediaOrMediaSingle) {
+      var pos;
+      var mediaSingleElement = getNodeType(possibleMediaOrMediaSingleElement) === 'mediaSingle' ? possibleMediaOrMediaSingleElement : findMediaParent(possibleMediaOrMediaSingleElement);
       if (mediaSingleElement) {
         pos = getStartPos(mediaSingleElement);
       }
-    } else {
-      pos = getStartPos(possibleMediaElement);
+      if (pos !== undefined) {
+        return {
+          from: pos,
+          to: pos
+        };
+      }
     }
-    if (pos !== undefined) {
-      return {
-        from: pos,
-        to: pos
-      };
+  } else {
+    if (possibleMediaOrMediaSingleElement && getNodeType(possibleMediaOrMediaSingleElement) === 'media') {
+      var _pos;
+      if (isCommentsOnMediaBugFixEnabled) {
+        var _mediaSingleElement = findMediaParent(possibleMediaOrMediaSingleElement);
+        if (_mediaSingleElement) {
+          _pos = getStartPos(_mediaSingleElement);
+        }
+      } else {
+        _pos = getStartPos(possibleMediaOrMediaSingleElement);
+      }
+      if (_pos !== undefined) {
+        return {
+          from: _pos,
+          to: _pos
+        };
+      }
     }
   }
   var from = resolvePos(startContainer, startOffset);

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

package/dist/cjs/ui/annotations/hover/range-validator.js

@@ -14,7 +14,7 @@ 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); }
 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 && Object.prototype.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 RangeValidator = exports.RangeValidator = function RangeValidator(props) {
-  var _providers$inlineComm;
+  var _providers$inlineComm, _providers$inlineComm2;
   var component = props.component,
     rendererRef = props.rendererRef,
     applyAnnotationDraftAt = props.applyAnnotationDraftAt,
@@ -30,10 +30,11 @@ var RangeValidator = exports.RangeValidator = function RangeValidator(props) {
     isWithinRange = _useAnnotationHoverCo.isWithinRange;
   var providers = (0, _react.useContext)(_context.ProvidersContext);
   var isCommentsOnMediaBugFixEnabled = (_providers$inlineComm = providers === null || providers === void 0 ? void 0 : providers.inlineComment.isCommentsOnMediaBugFixEnabled) !== null && _providers$inlineComm !== void 0 ? _providers$inlineComm : false;
+  var isCommentsOnMediaBugVideoCommentEnabled = (_providers$inlineComm2 = providers === null || providers === void 0 ? void 0 : providers.inlineComment.isCommentsOnMediaBugVideoCommentEnabled) !== null && _providers$inlineComm2 !== void 0 ? _providers$inlineComm2 : false;
   if (!range || type !== 'hover') {
     return null;
   }
-  var documentPosition = actions.getPositionFromRange(range, isCommentsOnMediaBugFixEnabled);
+  var documentPosition = actions.getPositionFromRange(range, isCommentsOnMediaBugFixEnabled, isCommentsOnMediaBugVideoCommentEnabled);
   return /*#__PURE__*/_react.default.createElement(_mounter.Mounter, {
     isWithinRange: isWithinRange,
     range: range,

package/dist/es2019/actions/index.js

@@ -145,11 +145,11 @@ export default class RendererActions {
     }
     return this._privateValidatePositionsForAnnotation(pos.from, pos.to);
   }
-  getPositionFromRange(range, isCommentsOnMediaBugFixEnabled) {
+  getPositionFromRange(range, isCommentsOnMediaBugFixEnabled, isCommentsOnMediaBugVideoComment) {
     if (!this.doc || !this.schema || !range) {
       return false;
     }
-    return getPosFromRange(range, isCommentsOnMediaBugFixEnabled);
+    return getPosFromRange(range, isCommentsOnMediaBugFixEnabled, isCommentsOnMediaBugVideoComment);
   }
   getAnnotationMarks() {
     const {
@@ -192,7 +192,7 @@ export default class RendererActions {
     }
     return getAnnotationIdsFromRange(pos, this.doc, this.schema);
   }
-  applyAnnotation(pos, annotation, isCommentsOnMediaBugFixEnabled) {
+  applyAnnotation(pos, annotation, isCommentsOnMediaBugFixEnabled, isCommentsOnMediaBugVideoCommentEnabled) {
     if (!this.doc || !pos || !this.schema) {
       return false;
     }

package/dist/es2019/steps/index.js

@@ -169,29 +169,47 @@ export function resolvePos(node, offset) {
   }
   return resolvedPos + offset;
 }
-export function getPosFromRange(range, isCommentsOnMediaBugFixEnabled) {
+export function getPosFromRange(range, isCommentsOnMediaBugFixEnabled, isCommentsOnMediaBugVideoCommentEnabled) {
   const {
     startContainer,
     startOffset,
     endContainer,
     endOffset
   } = range;
-  const possibleMediaElement = findParent(startContainer);
-  if (possibleMediaElement && getNodeType(possibleMediaElement) === 'media') {
-    let pos;
-    if (isCommentsOnMediaBugFixEnabled) {
-      const mediaSingleElement = findMediaParent(possibleMediaElement);
+  const possibleMediaOrMediaSingleElement = findParent(startContainer);
+  if (isCommentsOnMediaBugVideoCommentEnabled) {
+    // Video hover targets return media single, not media, thus, the extra check in condition.
+    const isMediaOrMediaSingle = possibleMediaOrMediaSingleElement && /media|mediaSingle/.test(getNodeType(possibleMediaOrMediaSingleElement) || '');
+    if (isMediaOrMediaSingle) {
+      let pos;
+      const mediaSingleElement = getNodeType(possibleMediaOrMediaSingleElement) === 'mediaSingle' ? possibleMediaOrMediaSingleElement : findMediaParent(possibleMediaOrMediaSingleElement);
       if (mediaSingleElement) {
         pos = getStartPos(mediaSingleElement);
       }
-    } else {
-      pos = getStartPos(possibleMediaElement);
+      if (pos !== undefined) {
+        return {
+          from: pos,
+          to: pos
+        };
+      }
     }
-    if (pos !== undefined) {
-      return {
-        from: pos,
-        to: pos
-      };
+  } else {
+    if (possibleMediaOrMediaSingleElement && getNodeType(possibleMediaOrMediaSingleElement) === 'media') {
+      let pos;
+      if (isCommentsOnMediaBugFixEnabled) {
+        const mediaSingleElement = findMediaParent(possibleMediaOrMediaSingleElement);
+        if (mediaSingleElement) {
+          pos = getStartPos(mediaSingleElement);
+        }
+      } else {
+        pos = getStartPos(possibleMediaOrMediaSingleElement);
+      }
+      if (pos !== undefined) {
+        return {
+          from: pos,
+          to: pos
+        };
+      }
     }
   }
   const from = resolvePos(startContainer, startOffset);

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.25.4";
+const packageVersion = "109.25.5";
 export const defaultNodeComponents = nodeToReact;
 export class Renderer extends PureComponent {
   constructor(props) {

package/dist/es2019/ui/annotations/hover/range-validator.js

@@ -5,7 +5,7 @@ import { useAnnotationRangeDispatch, useAnnotationRangeState } from '../contexts
 import { useAnnotationHoverContext } from '../contexts/AnnotationHoverContext';
 import { ProvidersContext } from '../context';
 export const RangeValidator = props => {
-  var _providers$inlineComm;
+  var _providers$inlineComm, _providers$inlineComm2;
   const {
     component,
     rendererRef,
@@ -26,10 +26,11 @@ export const RangeValidator = props => {
   } = useAnnotationHoverContext();
   const providers = useContext(ProvidersContext);
   const isCommentsOnMediaBugFixEnabled = (_providers$inlineComm = providers === null || providers === void 0 ? void 0 : providers.inlineComment.isCommentsOnMediaBugFixEnabled) !== null && _providers$inlineComm !== void 0 ? _providers$inlineComm : false;
+  const isCommentsOnMediaBugVideoCommentEnabled = (_providers$inlineComm2 = providers === null || providers === void 0 ? void 0 : providers.inlineComment.isCommentsOnMediaBugVideoCommentEnabled) !== null && _providers$inlineComm2 !== void 0 ? _providers$inlineComm2 : false;
   if (!range || type !== 'hover') {
     return null;
   }
-  const documentPosition = actions.getPositionFromRange(range, isCommentsOnMediaBugFixEnabled);
+  const documentPosition = actions.getPositionFromRange(range, isCommentsOnMediaBugFixEnabled, isCommentsOnMediaBugVideoCommentEnabled);
   return /*#__PURE__*/React.createElement(Mounter, {
     isWithinRange: isWithinRange,
     range: range,

package/dist/esm/actions/index.js

@@ -164,11 +164,11 @@ var RendererActions = /*#__PURE__*/function () {
     }
   }, {
     key: "getPositionFromRange",
-    value: function getPositionFromRange(range, isCommentsOnMediaBugFixEnabled) {
+    value: function getPositionFromRange(range, isCommentsOnMediaBugFixEnabled, isCommentsOnMediaBugVideoComment) {
       if (!this.doc || !this.schema || !range) {
         return false;
       }
-      return getPosFromRange(range, isCommentsOnMediaBugFixEnabled);
+      return getPosFromRange(range, isCommentsOnMediaBugFixEnabled, isCommentsOnMediaBugVideoComment);
     }
   }, {
     key: "getAnnotationMarks",
@@ -213,7 +213,7 @@ var RendererActions = /*#__PURE__*/function () {
     }
   }, {
     key: "applyAnnotation",
-    value: function applyAnnotation(pos, annotation, isCommentsOnMediaBugFixEnabled) {
+    value: function applyAnnotation(pos, annotation, isCommentsOnMediaBugFixEnabled, isCommentsOnMediaBugVideoCommentEnabled) {
       if (!this.doc || !pos || !this.schema) {
         return false;
       }

package/dist/esm/steps/index.js

@@ -165,27 +165,45 @@ export function resolvePos(node, offset) {
   }
   return resolvedPos + offset;
 }
-export function getPosFromRange(range, isCommentsOnMediaBugFixEnabled) {
+export function getPosFromRange(range, isCommentsOnMediaBugFixEnabled, isCommentsOnMediaBugVideoCommentEnabled) {
   var startContainer = range.startContainer,
     startOffset = range.startOffset,
     endContainer = range.endContainer,
     endOffset = range.endOffset;
-  var possibleMediaElement = findParent(startContainer);
-  if (possibleMediaElement && getNodeType(possibleMediaElement) === 'media') {
-    var pos;
-    if (isCommentsOnMediaBugFixEnabled) {
-      var mediaSingleElement = findMediaParent(possibleMediaElement);
+  var possibleMediaOrMediaSingleElement = findParent(startContainer);
+  if (isCommentsOnMediaBugVideoCommentEnabled) {
+    // Video hover targets return media single, not media, thus, the extra check in condition.
+    var isMediaOrMediaSingle = possibleMediaOrMediaSingleElement && /media|mediaSingle/.test(getNodeType(possibleMediaOrMediaSingleElement) || '');
+    if (isMediaOrMediaSingle) {
+      var pos;
+      var mediaSingleElement = getNodeType(possibleMediaOrMediaSingleElement) === 'mediaSingle' ? possibleMediaOrMediaSingleElement : findMediaParent(possibleMediaOrMediaSingleElement);
       if (mediaSingleElement) {
         pos = getStartPos(mediaSingleElement);
       }
-    } else {
-      pos = getStartPos(possibleMediaElement);
+      if (pos !== undefined) {
+        return {
+          from: pos,
+          to: pos
+        };
+      }
     }
-    if (pos !== undefined) {
-      return {
-        from: pos,
-        to: pos
-      };
+  } else {
+    if (possibleMediaOrMediaSingleElement && getNodeType(possibleMediaOrMediaSingleElement) === 'media') {
+      var _pos;
+      if (isCommentsOnMediaBugFixEnabled) {
+        var _mediaSingleElement = findMediaParent(possibleMediaOrMediaSingleElement);
+        if (_mediaSingleElement) {
+          _pos = getStartPos(_mediaSingleElement);
+        }
+      } else {
+        _pos = getStartPos(possibleMediaOrMediaSingleElement);
+      }
+      if (_pos !== undefined) {
+        return {
+          from: _pos,
+          to: _pos
+        };
+      }
     }
   }
   var from = resolvePos(startContainer, startOffset);

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

package/dist/esm/ui/annotations/hover/range-validator.js

@@ -5,7 +5,7 @@ import { useAnnotationRangeDispatch, useAnnotationRangeState } from '../contexts
 import { useAnnotationHoverContext } from '../contexts/AnnotationHoverContext';
 import { ProvidersContext } from '../context';
 export var RangeValidator = function RangeValidator(props) {
-  var _providers$inlineComm;
+  var _providers$inlineComm, _providers$inlineComm2;
   var component = props.component,
     rendererRef = props.rendererRef,
     applyAnnotationDraftAt = props.applyAnnotationDraftAt,
@@ -21,10 +21,11 @@ export var RangeValidator = function RangeValidator(props) {
     isWithinRange = _useAnnotationHoverCo.isWithinRange;
   var providers = useContext(ProvidersContext);
   var isCommentsOnMediaBugFixEnabled = (_providers$inlineComm = providers === null || providers === void 0 ? void 0 : providers.inlineComment.isCommentsOnMediaBugFixEnabled) !== null && _providers$inlineComm !== void 0 ? _providers$inlineComm : false;
+  var isCommentsOnMediaBugVideoCommentEnabled = (_providers$inlineComm2 = providers === null || providers === void 0 ? void 0 : providers.inlineComment.isCommentsOnMediaBugVideoCommentEnabled) !== null && _providers$inlineComm2 !== void 0 ? _providers$inlineComm2 : false;
   if (!range || type !== 'hover') {
     return null;
   }
-  var documentPosition = actions.getPositionFromRange(range, isCommentsOnMediaBugFixEnabled);
+  var documentPosition = actions.getPositionFromRange(range, isCommentsOnMediaBugFixEnabled, isCommentsOnMediaBugVideoCommentEnabled);
   return /*#__PURE__*/React.createElement(Mounter, {
     isWithinRange: isWithinRange,
     range: range,

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

@@ -52,10 +52,10 @@ export default class RendererActions implements RendererActionsOptions, Annotati
     annotate(range: Range, annotationId: string, annotationType: 'inlineComment'): AnnotationActionResult;
     isValidAnnotationRange(range: Range | null): boolean;
     isValidAnnotationPosition(pos: Position): boolean;
-    getPositionFromRange(range: Range | null, isCommentsOnMediaBugFixEnabled?: boolean): Position | false;
+    getPositionFromRange(range: Range | null, isCommentsOnMediaBugFixEnabled?: boolean, isCommentsOnMediaBugVideoComment?: boolean): Position | false;
     getAnnotationMarks(): Mark[];
     getAnnotationsByPosition(range: Range): string[];
-    applyAnnotation(pos: Position, annotation: Annotation, isCommentsOnMediaBugFixEnabled?: boolean): AnnotationActionResult;
+    applyAnnotation(pos: Position, annotation: Annotation, isCommentsOnMediaBugFixEnabled?: boolean, isCommentsOnMediaBugVideoCommentEnabled?: boolean): AnnotationActionResult;
     generateAnnotationIndexMatch(pos: Position): AnnotationByMatches | false;
 }
 export {};

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

@@ -6,7 +6,7 @@ interface AnnotationStepOptions {
     annotationId: string;
     annotationType: 'inlineComment';
 }
-export declare function getPosFromRange(range: Range, isCommentsOnMediaBugFixEnabled?: boolean): {
+export declare function getPosFromRange(range: Range, isCommentsOnMediaBugFixEnabled?: boolean, isCommentsOnMediaBugVideoCommentEnabled?: boolean): {
     from: number;
     to: number;
 } | false;

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

@@ -52,10 +52,10 @@ export default class RendererActions implements RendererActionsOptions, Annotati
     annotate(range: Range, annotationId: string, annotationType: 'inlineComment'): AnnotationActionResult;
     isValidAnnotationRange(range: Range | null): boolean;
     isValidAnnotationPosition(pos: Position): boolean;
-    getPositionFromRange(range: Range | null, isCommentsOnMediaBugFixEnabled?: boolean): Position | false;
+    getPositionFromRange(range: Range | null, isCommentsOnMediaBugFixEnabled?: boolean, isCommentsOnMediaBugVideoComment?: boolean): Position | false;
     getAnnotationMarks(): Mark[];
     getAnnotationsByPosition(range: Range): string[];
-    applyAnnotation(pos: Position, annotation: Annotation, isCommentsOnMediaBugFixEnabled?: boolean): AnnotationActionResult;
+    applyAnnotation(pos: Position, annotation: Annotation, isCommentsOnMediaBugFixEnabled?: boolean, isCommentsOnMediaBugVideoCommentEnabled?: boolean): AnnotationActionResult;
     generateAnnotationIndexMatch(pos: Position): AnnotationByMatches | false;
 }
 export {};

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

@@ -6,7 +6,7 @@ interface AnnotationStepOptions {
     annotationId: string;
     annotationType: 'inlineComment';
 }
-export declare function getPosFromRange(range: Range, isCommentsOnMediaBugFixEnabled?: boolean): {
+export declare function getPosFromRange(range: Range, isCommentsOnMediaBugFixEnabled?: boolean, isCommentsOnMediaBugVideoCommentEnabled?: boolean): {
     from: number;
     to: number;
 } | false;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/renderer",
-  "version": "109.25.4",
+  "version": "109.25.5",
   "description": "Renderer component",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -51,7 +51,7 @@
     "@atlaskit/status": "^1.4.0",
     "@atlaskit/task-decision": "^17.10.0",
     "@atlaskit/theme": "^12.8.0",
-    "@atlaskit/tokens": "^1.46.0",
+    "@atlaskit/tokens": "^1.47.0",
     "@atlaskit/tooltip": "^18.3.0",
     "@babel/runtime": "^7.0.0",
     "@emotion/react": "^11.7.1",