@atlaskit/editor-core 187.47.0 → 187.47.2

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @atlaskit/editor-core
 
+## 187.47.2
+
+### Patch Changes
+
+- [`c89c55c6d49`](https://bitbucket.org/atlassian/atlassian-frontend/commits/c89c55c6d49) - [ux] ED-19508 fixes closed inline comments reopening when user toggles an expand node
+
 ## 187.47.0
 
 ### Minor Changes

package/dist/cjs/plugins/annotation/commands/index.js

@@ -27,9 +27,12 @@ var updateInlineCommentResolvedState = function updateInlineCommentResolvedState
   return (0, _pluginFactory.createCommand)(command);
 };
 exports.updateInlineCommentResolvedState = updateInlineCommentResolvedState;
-var closeComponent = function closeComponent() {
+var closeComponent = function closeComponent(state) {
   return (0, _pluginFactory.createCommand)({
-    type: _types.ACTIONS.CLOSE_COMPONENT
+    type: _types.ACTIONS.CLOSE_COMPONENT,
+    data: {
+      lastClosedPos: state.selection.$head.pos
+    }
   });
 };
 exports.closeComponent = closeComponent;

package/dist/cjs/plugins/annotation/pm-plugins/inline-comment.js

@@ -156,7 +156,7 @@ var inlineCommentPlugin = function inlineCommentPlugin(options) {
       };
       var setSelectedAnnotationFn = function setSelectedAnnotationFn(annotationId) {
         if (!annotationId) {
-          (0, _commands.closeComponent)()(editorView.state, editorView.dispatch);
+          (0, _commands.closeComponent)(editorView.state)(editorView.state, editorView.dispatch);
         } else {
           (0, _commands.setSelectedAnnotation)(annotationId)(editorView.state, editorView.dispatch);
         }

package/dist/cjs/plugins/annotation/pm-plugins/reducer.js

@@ -21,7 +21,8 @@ var _default = function _default(pluginState, action) {
     case _types.ACTIONS.INLINE_COMMENT_UPDATE_MOUSE_STATE:
       var mouseData = Object.assign({}, pluginState.mouseData, action.data.mouseData);
       return _objectSpread(_objectSpread({}, pluginState), {}, {
-        mouseData: mouseData
+        mouseData: mouseData,
+        lastClosedPos: undefined
       });
     case _types.ACTIONS.SET_INLINE_COMMENT_DRAFT_STATE:
       return getNewDraftState(pluginState, action.data.drafting, action.data.editorState);
@@ -32,7 +33,8 @@ var _default = function _default(pluginState, action) {
       });
     case _types.ACTIONS.CLOSE_COMPONENT:
       return _objectSpread(_objectSpread({}, pluginState), {}, {
-        selectedAnnotations: []
+        selectedAnnotations: [],
+        lastClosedPos: action.data.lastClosedPos
       });
     case _types.ACTIONS.ADD_INLINE_COMMENT:
       var updatedPluginState = getNewDraftState(pluginState, action.data.drafting, action.data.editorState);

package/dist/cjs/plugins/annotation/ui/InlineCommentView.js

@@ -45,7 +45,8 @@ function InlineCommentView(_ref) {
   var _ref2 = inlineCommentState || {},
     bookmark = _ref2.bookmark,
     selectedAnnotations = _ref2.selectedAnnotations,
-    annotations = _ref2.annotations;
+    annotations = _ref2.annotations,
+    lastClosedPos = _ref2.lastClosedPos;
   var annotationsList = (0, _utils2.getAllAnnotations)(editorView.state.doc);
   var selection = (0, _utils2.getSelectionPositions)(state, inlineCommentState);
   var position = findPosForDOM(selection);
@@ -107,7 +108,9 @@ function InlineCommentView(_ref) {
   var activeAnnotations = (selectedAnnotations === null || selectedAnnotations === void 0 ? void 0 : selectedAnnotations.filter(function (mark) {
     return annotations && annotations[mark.id] === false;
   })) || [];
-  if (!ViewComponent || activeAnnotations.length === 0) {
+  if (!ViewComponent || activeAnnotations.length === 0 ||
+  // Check if the user has moved the selection since closing the previous comment
+  editorView.state.selection.$head.pos === lastClosedPos) {
     return null;
   }
   var onAnnotationViewed = function onAnnotationViewed() {
@@ -145,7 +148,7 @@ function InlineCommentView(_ref) {
       return (0, _commands.updateInlineCommentResolvedState)((0, _defineProperty2.default)({}, id, true), _inlineCommentEvents.RESOLVE_METHOD.COMPONENT)(editorView.state, editorView.dispatch);
     },
     onClose: function onClose() {
-      (0, _commands.closeComponent)()(editorView.state, editorView.dispatch);
+      (0, _commands.closeComponent)(editorView.state)(editorView.state, editorView.dispatch);
     }
   }));
 }

package/dist/cjs/version-wrapper.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.version = exports.nextMajorVersion = exports.name = void 0;
 var name = "@atlaskit/editor-core";
 exports.name = name;
-var version = "187.47.0";
+var version = "187.47.2";
 exports.version = version;
 var nextMajorVersion = function nextMajorVersion() {
   return [Number(version.split('.')[0]) + 1, 0, 0].join('.');

package/dist/es2019/plugins/annotation/commands/index.js

@@ -16,8 +16,11 @@ export const updateInlineCommentResolvedState = (partialNewState, resolveMethod)
   }
   return createCommand(command);
 };
-export const closeComponent = () => createCommand({
-  type: ACTIONS.CLOSE_COMPONENT
+export const closeComponent = state => createCommand({
+  type: ACTIONS.CLOSE_COMPONENT,
+  data: {
+    lastClosedPos: state.selection.$head.pos
+  }
 });
 export const clearDirtyMark = () => createCommand({
   type: ACTIONS.INLINE_COMMENT_CLEAR_DIRTY_MARK

package/dist/es2019/plugins/annotation/pm-plugins/inline-comment.js

@@ -99,7 +99,7 @@ export const inlineCommentPlugin = options => {
       const setVisibility = isVisible => onSetVisibility(editorView)(isVisible);
       const setSelectedAnnotationFn = annotationId => {
         if (!annotationId) {
-          closeComponent()(editorView.state, editorView.dispatch);
+          closeComponent(editorView.state)(editorView.state, editorView.dispatch);
         } else {
           setSelectedAnnotation(annotationId)(editorView.state, editorView.dispatch);
         }

package/dist/es2019/plugins/annotation/pm-plugins/reducer.js

@@ -15,7 +15,8 @@ export default ((pluginState, action) => {
       const mouseData = Object.assign({}, pluginState.mouseData, action.data.mouseData);
       return {
         ...pluginState,
-        mouseData
+        mouseData,
+        lastClosedPos: undefined
       };
     case ACTIONS.SET_INLINE_COMMENT_DRAFT_STATE:
       return getNewDraftState(pluginState, action.data.drafting, action.data.editorState);
@@ -28,7 +29,8 @@ export default ((pluginState, action) => {
     case ACTIONS.CLOSE_COMPONENT:
       return {
         ...pluginState,
-        selectedAnnotations: []
+        selectedAnnotations: [],
+        lastClosedPos: action.data.lastClosedPos
       };
     case ACTIONS.ADD_INLINE_COMMENT:
       const updatedPluginState = getNewDraftState(pluginState, action.data.drafting, action.data.editorState);

package/dist/es2019/plugins/annotation/ui/InlineCommentView.js

@@ -44,7 +44,8 @@ export function InlineCommentView({
   const {
     bookmark,
     selectedAnnotations,
-    annotations
+    annotations,
+    lastClosedPos
   } = inlineCommentState || {};
   const annotationsList = getAllAnnotations(editorView.state.doc);
   const selection = getSelectionPositions(state, inlineCommentState);
@@ -105,7 +106,9 @@ export function InlineCommentView({
 
   // View Component
   const activeAnnotations = (selectedAnnotations === null || selectedAnnotations === void 0 ? void 0 : selectedAnnotations.filter(mark => annotations && annotations[mark.id] === false)) || [];
-  if (!ViewComponent || activeAnnotations.length === 0) {
+  if (!ViewComponent || activeAnnotations.length === 0 ||
+  // Check if the user has moved the selection since closing the previous comment
+  editorView.state.selection.$head.pos === lastClosedPos) {
     return null;
   }
   const onAnnotationViewed = () => {
@@ -141,7 +144,7 @@ export function InlineCommentView({
       [id]: true
     }, RESOLVE_METHOD.COMPONENT)(editorView.state, editorView.dispatch),
     onClose: () => {
-      closeComponent()(editorView.state, editorView.dispatch);
+      closeComponent(editorView.state)(editorView.state, editorView.dispatch);
     }
   }));
 }

package/dist/es2019/version-wrapper.js

@@ -1,5 +1,5 @@
 export const name = "@atlaskit/editor-core";
-export const version = "187.47.0";
+export const version = "187.47.2";
 export const nextMajorVersion = () => {
   return [Number(version.split('.')[0]) + 1, 0, 0].join('.');
 };

package/dist/esm/plugins/annotation/commands/index.js

@@ -19,9 +19,12 @@ export var updateInlineCommentResolvedState = function updateInlineCommentResolv
   }
   return createCommand(command);
 };
-export var closeComponent = function closeComponent() {
+export var closeComponent = function closeComponent(state) {
   return createCommand({
-    type: ACTIONS.CLOSE_COMPONENT
+    type: ACTIONS.CLOSE_COMPONENT,
+    data: {
+      lastClosedPos: state.selection.$head.pos
+    }
   });
 };
 export var clearDirtyMark = function clearDirtyMark() {

package/dist/esm/plugins/annotation/pm-plugins/inline-comment.js

@@ -149,7 +149,7 @@ export var inlineCommentPlugin = function inlineCommentPlugin(options) {
       };
       var setSelectedAnnotationFn = function setSelectedAnnotationFn(annotationId) {
         if (!annotationId) {
-          closeComponent()(editorView.state, editorView.dispatch);
+          closeComponent(editorView.state)(editorView.state, editorView.dispatch);
         } else {
           setSelectedAnnotation(annotationId)(editorView.state, editorView.dispatch);
         }

package/dist/esm/plugins/annotation/pm-plugins/reducer.js

@@ -14,7 +14,8 @@ export default (function (pluginState, action) {
     case ACTIONS.INLINE_COMMENT_UPDATE_MOUSE_STATE:
       var mouseData = Object.assign({}, pluginState.mouseData, action.data.mouseData);
       return _objectSpread(_objectSpread({}, pluginState), {}, {
-        mouseData: mouseData
+        mouseData: mouseData,
+        lastClosedPos: undefined
       });
     case ACTIONS.SET_INLINE_COMMENT_DRAFT_STATE:
       return getNewDraftState(pluginState, action.data.drafting, action.data.editorState);
@@ -25,7 +26,8 @@ export default (function (pluginState, action) {
       });
     case ACTIONS.CLOSE_COMPONENT:
       return _objectSpread(_objectSpread({}, pluginState), {}, {
-        selectedAnnotations: []
+        selectedAnnotations: [],
+        lastClosedPos: action.data.lastClosedPos
       });
     case ACTIONS.ADD_INLINE_COMMENT:
       var updatedPluginState = getNewDraftState(pluginState, action.data.drafting, action.data.editorState);

package/dist/esm/plugins/annotation/ui/InlineCommentView.js

@@ -38,7 +38,8 @@ export function InlineCommentView(_ref) {
   var _ref2 = inlineCommentState || {},
     bookmark = _ref2.bookmark,
     selectedAnnotations = _ref2.selectedAnnotations,
-    annotations = _ref2.annotations;
+    annotations = _ref2.annotations,
+    lastClosedPos = _ref2.lastClosedPos;
   var annotationsList = getAllAnnotations(editorView.state.doc);
   var selection = getSelectionPositions(state, inlineCommentState);
   var position = findPosForDOM(selection);
@@ -100,7 +101,9 @@ export function InlineCommentView(_ref) {
   var activeAnnotations = (selectedAnnotations === null || selectedAnnotations === void 0 ? void 0 : selectedAnnotations.filter(function (mark) {
     return annotations && annotations[mark.id] === false;
   })) || [];
-  if (!ViewComponent || activeAnnotations.length === 0) {
+  if (!ViewComponent || activeAnnotations.length === 0 ||
+  // Check if the user has moved the selection since closing the previous comment
+  editorView.state.selection.$head.pos === lastClosedPos) {
     return null;
   }
   var onAnnotationViewed = function onAnnotationViewed() {
@@ -138,7 +141,7 @@ export function InlineCommentView(_ref) {
       return updateInlineCommentResolvedState(_defineProperty({}, id, true), RESOLVE_METHOD.COMPONENT)(editorView.state, editorView.dispatch);
     },
     onClose: function onClose() {
-      closeComponent()(editorView.state, editorView.dispatch);
+      closeComponent(editorView.state)(editorView.state, editorView.dispatch);
     }
   }));
 }

package/dist/esm/version-wrapper.js

@@ -1,5 +1,5 @@
 export var name = "@atlaskit/editor-core";
-export var version = "187.47.0";
+export var version = "187.47.2";
 export var nextMajorVersion = function nextMajorVersion() {
   return [Number(version.split('.')[0]) + 1, 0, 0].join('.');
 };

package/dist/types/plugins/annotation/commands/index.d.ts

@@ -1,10 +1,11 @@
+import type { EditorState } from '@atlaskit/editor-prosemirror/state';
 import type { RESOLVE_METHOD } from './../../analytics/types/inline-comment-events';
 import type { Command } from '../../../types';
 import { AnnotationTypes } from '@atlaskit/adf-schema';
 import { INPUT_METHOD } from '../../analytics';
 import type { InlineCommentMap, InlineCommentMouseData } from '../pm-plugins/types';
 export declare const updateInlineCommentResolvedState: (partialNewState: InlineCommentMap, resolveMethod?: RESOLVE_METHOD) => Command;
-export declare const closeComponent: () => Command;
+export declare const closeComponent: (state: EditorState) => Command;
 export declare const clearDirtyMark: () => Command;
 export declare const removeInlineCommentNearSelection: (id: string) => Command;
 export declare const setInlineCommentDraftState: (drafting: boolean, inputMethod?: INPUT_METHOD.TOOLBAR | INPUT_METHOD.SHORTCUT) => Command;

package/dist/types/plugins/annotation/pm-plugins/types.d.ts

@@ -43,6 +43,9 @@ export type InlineCommentAction = {
     type: ACTIONS.INLINE_COMMENT_CLEAR_DIRTY_MARK;
 } | {
     type: ACTIONS.CLOSE_COMPONENT;
+    data: {
+        lastClosedPos: number;
+    };
 } | {
     type: ACTIONS.ADD_INLINE_COMMENT;
     data: {
@@ -71,4 +74,5 @@ export type InlineCommentPluginState = {
     bookmark?: SelectionBookmark;
     disallowOnWhitespace: boolean;
     isVisible: boolean;
+    lastClosedPos?: number;
 };

package/dist/types-ts4.5/plugins/annotation/commands/index.d.ts

@@ -1,10 +1,11 @@
+import type { EditorState } from '@atlaskit/editor-prosemirror/state';
 import type { RESOLVE_METHOD } from './../../analytics/types/inline-comment-events';
 import type { Command } from '../../../types';
 import { AnnotationTypes } from '@atlaskit/adf-schema';
 import { INPUT_METHOD } from '../../analytics';
 import type { InlineCommentMap, InlineCommentMouseData } from '../pm-plugins/types';
 export declare const updateInlineCommentResolvedState: (partialNewState: InlineCommentMap, resolveMethod?: RESOLVE_METHOD) => Command;
-export declare const closeComponent: () => Command;
+export declare const closeComponent: (state: EditorState) => Command;
 export declare const clearDirtyMark: () => Command;
 export declare const removeInlineCommentNearSelection: (id: string) => Command;
 export declare const setInlineCommentDraftState: (drafting: boolean, inputMethod?: INPUT_METHOD.TOOLBAR | INPUT_METHOD.SHORTCUT) => Command;

package/dist/types-ts4.5/plugins/annotation/pm-plugins/types.d.ts

@@ -43,6 +43,9 @@ export type InlineCommentAction = {
     type: ACTIONS.INLINE_COMMENT_CLEAR_DIRTY_MARK;
 } | {
     type: ACTIONS.CLOSE_COMPONENT;
+    data: {
+        lastClosedPos: number;
+    };
 } | {
     type: ACTIONS.ADD_INLINE_COMMENT;
     data: {
@@ -71,4 +74,5 @@ export type InlineCommentPluginState = {
     bookmark?: SelectionBookmark;
     disallowOnWhitespace: boolean;
     isVisible: boolean;
+    lastClosedPos?: number;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-core",
-  "version": "187.47.0",
+  "version": "187.47.2",
   "description": "A package contains Atlassian editor core functionality",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"