@atlaskit/renderer 118.2.1 → 118.2.2

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @atlaskit/renderer
 
+## 118.2.2
+
+### Patch Changes
+
+- [#160385](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/160385)
+  [`48d95956a007a`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/48d95956a007a) -
+  EDITOR-788 - Renderer comment creation process is broken
+- Updated dependencies
+
 ## 118.2.1
 
 ### Patch Changes

package/afm-jira/tsconfig.json

@@ -59,6 +59,9 @@
 		{
 			"path": "../../../design-system/icon/afm-jira/tsconfig.json"
 		},
+		{
+			"path": "../../../design-system/link/afm-jira/tsconfig.json"
+		},
 		{
 			"path": "../../../linking-platform/link-datasource/afm-jira/tsconfig.json"
 		},

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 = "118.2.1";
+var packageVersion = "118.2.2";
 var setAsQueryContainerStyles = (0, _react2.css)({
   containerName: 'ak-renderer-wrapper',
   containerType: 'inline-size'

package/dist/cjs/ui/annotations/element/mark.js

@@ -13,6 +13,7 @@ var _adfSchema = require("@atlaskit/adf-schema");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _reactIntlNext = require("react-intl-next");
 var _messages = require("../../../messages");
+var _AnnotationManagerContext = require("../contexts/AnnotationManagerContext");
 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; } /**
  * @jsxRuntime classic
@@ -126,6 +127,22 @@ var MarkComponent = exports.MarkComponent = function MarkComponent(_ref) {
   var annotationIds = (0, _react.useMemo)(function () {
     return (0, _toConsumableArray2.default)(new Set([].concat((0, _toConsumableArray2.default)(annotationParentIds), [id])));
   }, [id, annotationParentIds]);
+  var _useAnnotationManager = (0, _AnnotationManagerContext.useAnnotationManagerDispatch)(),
+    dispatch = _useAnnotationManager.dispatch;
+  var _useAnnotationManager2 = (0, _AnnotationManagerContext.useAnnotationManagerState)(),
+    currentSelectedAnnotationId = _useAnnotationManager2.currentSelectedAnnotationId;
+
+  // after creating a new annotation, we need to set the markRef to the new mark
+  var markRef = (0, _react.useCallback)(function (node) {
+    if (id === currentSelectedAnnotationId && node) {
+      dispatch({
+        type: 'setSelectedMarkRef',
+        data: {
+          markRef: node
+        }
+      });
+    }
+  }, [dispatch, id, currentSelectedAnnotationId]);
   var onMarkClick = (0, _react.useCallback)(function (event) {
     // prevent inline mark logic for media block marks
     if (event.currentTarget instanceof HTMLElement && event.currentTarget.getAttribute('data-block-mark')) {
@@ -193,6 +210,7 @@ var MarkComponent = exports.MarkComponent = function MarkComponent(_ref) {
     'aria-details': annotationIds.join(', ')
   }, desktopAccessibilityAttributes);
   return (0, _react2.jsx)(useBlockLevel ? 'div' : 'mark', _objectSpread(_objectSpread(_objectSpread((0, _defineProperty2.default)({
+    ref: id === currentSelectedAnnotationId ? markRef : undefined,
     id: id
   }, (0, _platformFeatureFlags.fg)('editor_inline_comments_on_inline_nodes') ? 'onClickCapture' : 'onClick', onMarkClick), accessibility), overriddenData), !useBlockLevel && {
     css: [markStyles, (0, _platformFeatureFlags.fg)('platform_renderer_nested_annotation_styling') && markStylesLayeringFix, (0, _platformFeatureFlags.fg)('editor_inline_comments_on_inline_nodes') && markStylesWithInlineComments, (0, _platformFeatureFlags.fg)('confluence-frontend-comments-panel') && markStylesWithCommentsPanel, !isMobile() && accessibilityStyles, markStylesWithUpdatedShadow],

package/dist/cjs/ui/annotations/hooks/use-events.js

@@ -124,6 +124,10 @@ var useHasFocusEvent = exports.useHasFocusEvent = function useHasFocusEvent(_ref
     };
   }
 };
+var NO_ANNOTATION_SELECTED = {
+  annotations: [],
+  clickElementTarget: undefined
+};
 var useAnnotationClickEvent = exports.useAnnotationClickEvent = function useAnnotationClickEvent(props) {
   var _useState7 = (0, _react.useState)(null),
     _useState8 = (0, _slicedToArray2.default)(_useState7, 2),
@@ -142,10 +146,11 @@ var useAnnotationClickEvent = exports.useAnnotationClickEvent = function useAnno
         type: _adfSchema.AnnotationTypes.INLINE_COMMENT
       }],
       clickElementTarget: currentSelectedMarkRef
-    } : {
-      annotations: [],
-      clickElementTarget: undefined
-    };
+    } :
+    // This is a constant to represent the case when no annotation is selected.
+    // When creating a new annotation, currentSelectedAnnotationId and currentSelectedMarkRef will be set one after another,
+    // if this isn't a const, it will cause useMemo to return two different "empty" objects and causes infinite re-renders.
+    NO_ANNOTATION_SELECTED;
   }, [currentSelectedAnnotationId, currentSelectedMarkRef]);
   (0, _react.useLayoutEffect)(function () {
     if (!updateSubscriber || isNestedRender) {

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

@@ -48,7 +48,7 @@ import { PortalContext } from './PortalContext';
 export const NORMAL_SEVERITY_THRESHOLD = 2000;
 export const DEGRADED_SEVERITY_THRESHOLD = 3000;
 const packageName = "@atlaskit/renderer";
-const packageVersion = "118.2.1";
+const packageVersion = "118.2.2";
 const setAsQueryContainerStyles = css({
   containerName: 'ak-renderer-wrapper',
   containerType: 'inline-size'

package/dist/es2019/ui/annotations/element/mark.js

@@ -10,6 +10,7 @@ import { AnnotationMarkStates } from '@atlaskit/adf-schema';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { useIntl } from 'react-intl-next';
 import { inlineCommentMessages } from '../../../messages';
+import { useAnnotationManagerDispatch, useAnnotationManagerState } from '../contexts/AnnotationManagerContext';
 const markStyles = css({
   color: 'inherit',
   backgroundColor: 'unset',
@@ -131,6 +132,24 @@ export const MarkComponent = ({
 }) => {
   const intl = useIntl();
   const annotationIds = useMemo(() => [...new Set([...annotationParentIds, id])], [id, annotationParentIds]);
+  const {
+    dispatch
+  } = useAnnotationManagerDispatch();
+  const {
+    currentSelectedAnnotationId
+  } = useAnnotationManagerState();
+
+  // after creating a new annotation, we need to set the markRef to the new mark
+  const markRef = useCallback(node => {
+    if (id === currentSelectedAnnotationId && node) {
+      dispatch({
+        type: 'setSelectedMarkRef',
+        data: {
+          markRef: node
+        }
+      });
+    }
+  }, [dispatch, id, currentSelectedAnnotationId]);
   const onMarkClick = useCallback(event => {
     // prevent inline mark logic for media block marks
     if (event.currentTarget instanceof HTMLElement && event.currentTarget.getAttribute('data-block-mark')) {
@@ -200,6 +219,7 @@ export const MarkComponent = ({
     ...desktopAccessibilityAttributes
   };
   return jsx(useBlockLevel ? 'div' : 'mark', {
+    ref: id === currentSelectedAnnotationId ? markRef : undefined,
     id,
     [fg('editor_inline_comments_on_inline_nodes') ? 'onClickCapture' : 'onClick']: onMarkClick,
     ...accessibility,

package/dist/es2019/ui/annotations/hooks/use-events.js

@@ -118,6 +118,10 @@ export const useHasFocusEvent = ({
     };
   }
 };
+const NO_ANNOTATION_SELECTED = {
+  annotations: [],
+  clickElementTarget: undefined
+};
 export const useAnnotationClickEvent = props => {
   const [annotationClickEvent, setAnnotationClickEvent] = useState(null);
   const {
@@ -136,10 +140,11 @@ export const useAnnotationClickEvent = props => {
         type: AnnotationTypes.INLINE_COMMENT
       }],
       clickElementTarget: currentSelectedMarkRef
-    } : {
-      annotations: [],
-      clickElementTarget: undefined
-    };
+    } :
+    // This is a constant to represent the case when no annotation is selected.
+    // When creating a new annotation, currentSelectedAnnotationId and currentSelectedMarkRef will be set one after another,
+    // if this isn't a const, it will cause useMemo to return two different "empty" objects and causes infinite re-renders.
+    NO_ANNOTATION_SELECTED;
   }, [currentSelectedAnnotationId, currentSelectedMarkRef]);
   useLayoutEffect(() => {
     if (!updateSubscriber || isNestedRender) {

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

@@ -53,7 +53,7 @@ import { PortalContext } from './PortalContext';
 export var NORMAL_SEVERITY_THRESHOLD = 2000;
 export var DEGRADED_SEVERITY_THRESHOLD = 3000;
 var packageName = "@atlaskit/renderer";
-var packageVersion = "118.2.1";
+var packageVersion = "118.2.2";
 var setAsQueryContainerStyles = css({
   containerName: 'ak-renderer-wrapper',
   containerType: 'inline-size'

package/dist/esm/ui/annotations/element/mark.js

@@ -14,6 +14,7 @@ import { AnnotationMarkStates } from '@atlaskit/adf-schema';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { useIntl } from 'react-intl-next';
 import { inlineCommentMessages } from '../../../messages';
+import { useAnnotationManagerDispatch, useAnnotationManagerState } from '../contexts/AnnotationManagerContext';
 var markStyles = css(_defineProperty({
   color: 'inherit',
   backgroundColor: 'unset',
@@ -122,6 +123,22 @@ export var MarkComponent = function MarkComponent(_ref) {
   var annotationIds = useMemo(function () {
     return _toConsumableArray(new Set([].concat(_toConsumableArray(annotationParentIds), [id])));
   }, [id, annotationParentIds]);
+  var _useAnnotationManager = useAnnotationManagerDispatch(),
+    dispatch = _useAnnotationManager.dispatch;
+  var _useAnnotationManager2 = useAnnotationManagerState(),
+    currentSelectedAnnotationId = _useAnnotationManager2.currentSelectedAnnotationId;
+
+  // after creating a new annotation, we need to set the markRef to the new mark
+  var markRef = useCallback(function (node) {
+    if (id === currentSelectedAnnotationId && node) {
+      dispatch({
+        type: 'setSelectedMarkRef',
+        data: {
+          markRef: node
+        }
+      });
+    }
+  }, [dispatch, id, currentSelectedAnnotationId]);
   var onMarkClick = useCallback(function (event) {
     // prevent inline mark logic for media block marks
     if (event.currentTarget instanceof HTMLElement && event.currentTarget.getAttribute('data-block-mark')) {
@@ -189,6 +206,7 @@ export var MarkComponent = function MarkComponent(_ref) {
     'aria-details': annotationIds.join(', ')
   }, desktopAccessibilityAttributes);
   return jsx(useBlockLevel ? 'div' : 'mark', _objectSpread(_objectSpread(_objectSpread(_defineProperty({
+    ref: id === currentSelectedAnnotationId ? markRef : undefined,
     id: id
   }, fg('editor_inline_comments_on_inline_nodes') ? 'onClickCapture' : 'onClick', onMarkClick), accessibility), overriddenData), !useBlockLevel && {
     css: [markStyles, fg('platform_renderer_nested_annotation_styling') && markStylesLayeringFix, fg('editor_inline_comments_on_inline_nodes') && markStylesWithInlineComments, fg('confluence-frontend-comments-panel') && markStylesWithCommentsPanel, !isMobile() && accessibilityStyles, markStylesWithUpdatedShadow],

package/dist/esm/ui/annotations/hooks/use-events.js

@@ -117,6 +117,10 @@ export var useHasFocusEvent = function useHasFocusEvent(_ref2) {
     };
   }
 };
+var NO_ANNOTATION_SELECTED = {
+  annotations: [],
+  clickElementTarget: undefined
+};
 export var useAnnotationClickEvent = function useAnnotationClickEvent(props) {
   var _useState7 = useState(null),
     _useState8 = _slicedToArray(_useState7, 2),
@@ -135,10 +139,11 @@ export var useAnnotationClickEvent = function useAnnotationClickEvent(props) {
         type: AnnotationTypes.INLINE_COMMENT
       }],
       clickElementTarget: currentSelectedMarkRef
-    } : {
-      annotations: [],
-      clickElementTarget: undefined
-    };
+    } :
+    // This is a constant to represent the case when no annotation is selected.
+    // When creating a new annotation, currentSelectedAnnotationId and currentSelectedMarkRef will be set one after another,
+    // if this isn't a const, it will cause useMemo to return two different "empty" objects and causes infinite re-renders.
+    NO_ANNOTATION_SELECTED;
   }, [currentSelectedAnnotationId, currentSelectedMarkRef]);
   useLayoutEffect(function () {
     if (!updateSubscriber || isNestedRender) {

package/dist/types/ui/annotations/element/mark.d.ts

@@ -27,6 +27,7 @@ export declare const MarkComponent: ({ annotationParentIds, children, dataAttrib
     'data-id': string;
     'data-mark-annotation-state'?: AnnotationMarkStates | undefined;
     'aria-disabled': boolean;
+    ref: ((node: HTMLElement | null) => void) | undefined;
     id: string;
 } | {
     css?: (false | import("@emotion/react").SerializedStyles)[] | undefined;
@@ -41,6 +42,7 @@ export declare const MarkComponent: ({ annotationParentIds, children, dataAttrib
     'data-mark-annotation-type': import("@atlaskit/adf-schema").AnnotationTypes;
     'data-id': string;
     'aria-disabled': boolean;
+    ref: ((node: HTMLElement | null) => void) | undefined;
     id: string;
 } | {
     css?: (false | import("@emotion/react").SerializedStyles)[] | undefined;
@@ -58,6 +60,7 @@ export declare const MarkComponent: ({ annotationParentIds, children, dataAttrib
     'aria-expanded'?: undefined;
     'aria-details': string;
     'aria-disabled'?: undefined;
+    ref: ((node: HTMLElement | null) => void) | undefined;
     id: string;
 } | {
     css?: (false | import("@emotion/react").SerializedStyles)[] | undefined;
@@ -77,6 +80,7 @@ export declare const MarkComponent: ({ annotationParentIds, children, dataAttrib
     'aria-expanded'?: undefined;
     'aria-details': string;
     'aria-disabled'?: undefined;
+    ref: ((node: HTMLElement | null) => void) | undefined;
     id: string;
 } | {
     css?: (false | import("@emotion/react").SerializedStyles)[] | undefined;
@@ -94,6 +98,7 @@ export declare const MarkComponent: ({ annotationParentIds, children, dataAttrib
     'aria-expanded': boolean;
     'aria-details': string;
     'aria-disabled'?: undefined;
+    ref: ((node: HTMLElement | null) => void) | undefined;
     id: string;
 } | {
     css?: (false | import("@emotion/react").SerializedStyles)[] | undefined;
@@ -113,6 +118,7 @@ export declare const MarkComponent: ({ annotationParentIds, children, dataAttrib
     'aria-expanded': boolean;
     'aria-details': string;
     'aria-disabled'?: undefined;
+    ref: ((node: HTMLElement | null) => void) | undefined;
     id: string;
 }, string | React.JSXElementConstructor<any>>;
 export {};

package/dist/types-ts4.5/ui/annotations/element/mark.d.ts

@@ -27,6 +27,7 @@ export declare const MarkComponent: ({ annotationParentIds, children, dataAttrib
     'data-id': string;
     'data-mark-annotation-state'?: AnnotationMarkStates | undefined;
     'aria-disabled': boolean;
+    ref: ((node: HTMLElement | null) => void) | undefined;
     id: string;
 } | {
     css?: (false | import("@emotion/react").SerializedStyles)[] | undefined;
@@ -41,6 +42,7 @@ export declare const MarkComponent: ({ annotationParentIds, children, dataAttrib
     'data-mark-annotation-type': import("@atlaskit/adf-schema").AnnotationTypes;
     'data-id': string;
     'aria-disabled': boolean;
+    ref: ((node: HTMLElement | null) => void) | undefined;
     id: string;
 } | {
     css?: (false | import("@emotion/react").SerializedStyles)[] | undefined;
@@ -58,6 +60,7 @@ export declare const MarkComponent: ({ annotationParentIds, children, dataAttrib
     'aria-expanded'?: undefined;
     'aria-details': string;
     'aria-disabled'?: undefined;
+    ref: ((node: HTMLElement | null) => void) | undefined;
     id: string;
 } | {
     css?: (false | import("@emotion/react").SerializedStyles)[] | undefined;
@@ -77,6 +80,7 @@ export declare const MarkComponent: ({ annotationParentIds, children, dataAttrib
     'aria-expanded'?: undefined;
     'aria-details': string;
     'aria-disabled'?: undefined;
+    ref: ((node: HTMLElement | null) => void) | undefined;
     id: string;
 } | {
     css?: (false | import("@emotion/react").SerializedStyles)[] | undefined;
@@ -94,6 +98,7 @@ export declare const MarkComponent: ({ annotationParentIds, children, dataAttrib
     'aria-expanded': boolean;
     'aria-details': string;
     'aria-disabled'?: undefined;
+    ref: ((node: HTMLElement | null) => void) | undefined;
     id: string;
 } | {
     css?: (false | import("@emotion/react").SerializedStyles)[] | undefined;
@@ -113,6 +118,7 @@ export declare const MarkComponent: ({ annotationParentIds, children, dataAttrib
     'aria-expanded': boolean;
     'aria-details': string;
     'aria-disabled'?: undefined;
+    ref: ((node: HTMLElement | null) => void) | undefined;
     id: string;
 }, string | React.JSXElementConstructor<any>>;
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/renderer",
-	"version": "118.2.1",
+	"version": "118.2.2",
 	"description": "Renderer component",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -48,15 +48,15 @@
 		"@atlaskit/media-common": "^12.1.0",
 		"@atlaskit/media-filmstrip": "^50.1.0",
 		"@atlaskit/media-ui": "^28.2.0",
-		"@atlaskit/media-viewer": "^52.1.0",
+		"@atlaskit/media-viewer": "^52.2.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
 		"@atlaskit/platform-feature-flags-react": "^0.2.0",
 		"@atlaskit/react-ufo": "^3.13.0",
-		"@atlaskit/smart-card": "^38.4.0",
+		"@atlaskit/smart-card": "^38.5.0",
 		"@atlaskit/status": "^3.0.0",
 		"@atlaskit/task-decision": "^19.2.0",
 		"@atlaskit/theme": "^18.0.0",
-		"@atlaskit/tmp-editor-statsig": "^4.23.0",
+		"@atlaskit/tmp-editor-statsig": "^4.25.0",
 		"@atlaskit/tokens": "^4.9.0",
 		"@atlaskit/tooltip": "^20.0.0",
 		"@atlaskit/visually-hidden": "^3.0.0",
@@ -70,7 +70,7 @@
 		"uuid": "^3.1.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/link-provider": "^3.0.0",
+		"@atlaskit/link-provider": "^3.1.0",
 		"@atlaskit/media-core": "^36.1.0",
 		"react": "^18.2.0",
 		"react-dom": "^18.2.0"
@@ -81,7 +81,7 @@
 		"@atlaskit/analytics-gas-types": "^5.1.0",
 		"@atlaskit/checkbox": "^17.1.0",
 		"@atlaskit/css-reset": "^7.3.0",
-		"@atlaskit/link-provider": "^3.0.0",
+		"@atlaskit/link-provider": "^3.1.0",
 		"@atlaskit/link-test-helpers": "^8.0.0",
 		"@atlaskit/linking-common": "^9.0.0",
 		"@atlaskit/media-core": "^36.1.0",