@atlaskit/editor-core 188.10.0 → 188.10.1

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @atlaskit/editor-core
 
+## 188.10.1
+
+### Patch Changes
+
+- [#40950](https://bitbucket.org/atlassian/atlassian-frontend/pull-requests/40950) [`6fa1988ec35`](https://bitbucket.org/atlassian/atlassian-frontend/commits/6fa1988ec35) - clean up FF for enabling fallback to reconcile
+- [#40056](https://bitbucket.org/atlassian/atlassian-frontend/pull-requests/40056) [`1a189e4493d`](https://bitbucket.org/atlassian/atlassian-frontend/commits/1a189e4493d) - [ux] COMMENTS-481: reverted changes from ED-19508
+
 ## 188.10.0
 
 ### Minor Changes

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

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

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

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

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

@@ -21,8 +21,7 @@ var _default = exports.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,
-        lastClosedPos: undefined
+        mouseData: mouseData
       });
     case _types.ACTIONS.SET_INLINE_COMMENT_DRAFT_STATE:
       return getNewDraftState(pluginState, action.data.drafting, action.data.editorState);
@@ -33,8 +32,7 @@ var _default = exports.default = function _default(pluginState, action) {
       });
     case _types.ACTIONS.CLOSE_COMPONENT:
       return _objectSpread(_objectSpread({}, pluginState), {}, {
-        selectedAnnotations: [],
-        lastClosedPos: action.data.lastClosedPos
+        selectedAnnotations: []
       });
     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,8 +45,7 @@ function InlineCommentView(_ref) {
   var _ref2 = inlineCommentState || {},
     bookmark = _ref2.bookmark,
     selectedAnnotations = _ref2.selectedAnnotations,
-    annotations = _ref2.annotations,
-    lastClosedPos = _ref2.lastClosedPos;
+    annotations = _ref2.annotations;
   var annotationsList = (0, _utils2.getAllAnnotations)(editorView.state.doc);
   var selection = (0, _utils2.getSelectionPositions)(state, inlineCommentState);
   var position = findPosForDOM(selection);
@@ -108,9 +107,7 @@ 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 ||
-  // Check if the user has moved the selection since closing the previous comment
-  editorView.state.selection.$head.pos === lastClosedPos) {
+  if (!ViewComponent || activeAnnotations.length === 0) {
     return null;
   }
   var onAnnotationViewed = function onAnnotationViewed() {
@@ -148,7 +145,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.state, editorView.dispatch);
+      (0, _commands.closeComponent)()(editorView.state, editorView.dispatch);
     }
   }));
 }

package/dist/cjs/utils/commands.js

@@ -7,6 +7,7 @@ exports.withScrollIntoView = exports.isNthParentOfType = void 0;
 /**
  * Creates a filter that checks if the node at a given number of parents above the current
  * selection is of the correct node type.
+ *
  * @param nodeType The node type to compare the nth parent against
  * @param depthAway How many levels above the current node to check against. 0 refers to
  * the current selection's parent, which will be the containing node when the selection

package/dist/cjs/version-wrapper.js

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

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

@@ -16,11 +16,8 @@ export const updateInlineCommentResolvedState = (partialNewState, resolveMethod)
   }
   return createCommand(command);
 };
-export const closeComponent = state => createCommand({
-  type: ACTIONS.CLOSE_COMPONENT,
-  data: {
-    lastClosedPos: state.selection.$head.pos
-  }
+export const closeComponent = () => createCommand({
+  type: ACTIONS.CLOSE_COMPONENT
 });
 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.state, editorView.dispatch);
+          closeComponent()(editorView.state, editorView.dispatch);
         } else {
           setSelectedAnnotation(annotationId)(editorView.state, editorView.dispatch);
         }

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

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

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

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

package/dist/es2019/utils/commands.js

@@ -1,6 +1,7 @@
 /**
  * Creates a filter that checks if the node at a given number of parents above the current
  * selection is of the correct node type.
+ *
  * @param nodeType The node type to compare the nth parent against
  * @param depthAway How many levels above the current node to check against. 0 refers to
  * the current selection's parent, which will be the containing node when the selection

package/dist/es2019/version-wrapper.js

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

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

@@ -19,12 +19,9 @@ export var updateInlineCommentResolvedState = function updateInlineCommentResolv
   }
   return createCommand(command);
 };
-export var closeComponent = function closeComponent(state) {
+export var closeComponent = function closeComponent() {
   return createCommand({
-    type: ACTIONS.CLOSE_COMPONENT,
-    data: {
-      lastClosedPos: state.selection.$head.pos
-    }
+    type: ACTIONS.CLOSE_COMPONENT
   });
 };
 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.state, editorView.dispatch);
+          closeComponent()(editorView.state, editorView.dispatch);
         } else {
           setSelectedAnnotation(annotationId)(editorView.state, editorView.dispatch);
         }

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

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

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

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

package/dist/esm/utils/commands.js

@@ -1,6 +1,7 @@
 /**
  * Creates a filter that checks if the node at a given number of parents above the current
  * selection is of the correct node type.
+ *
  * @param nodeType The node type to compare the nth parent against
  * @param depthAway How many levels above the current node to check against. 0 refers to
  * the current selection's parent, which will be the containing node when the selection

package/dist/esm/version-wrapper.js

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

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

@@ -1,11 +1,10 @@
-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: (state: EditorState) => Command;
+export declare const closeComponent: () => 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,9 +43,6 @@ export type InlineCommentAction = {
     type: ACTIONS.INLINE_COMMENT_CLEAR_DIRTY_MARK;
 } | {
     type: ACTIONS.CLOSE_COMPONENT;
-    data: {
-        lastClosedPos: number;
-    };
 } | {
     type: ACTIONS.ADD_INLINE_COMMENT;
     data: {
@@ -74,5 +71,4 @@ export type InlineCommentPluginState = {
     bookmark?: SelectionBookmark;
     disallowOnWhitespace: boolean;
     isVisible: boolean;
-    lastClosedPos?: number;
 };

package/dist/types/utils/commands.d.ts

@@ -4,6 +4,7 @@ import type { HigherOrderCommand } from '@atlaskit/editor-common/types';
 /**
  * Creates a filter that checks if the node at a given number of parents above the current
  * selection is of the correct node type.
+ *
  * @param nodeType The node type to compare the nth parent against
  * @param depthAway How many levels above the current node to check against. 0 refers to
  * the current selection's parent, which will be the containing node when the selection

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

@@ -1,11 +1,10 @@
-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: (state: EditorState) => Command;
+export declare const closeComponent: () => 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,9 +43,6 @@ export type InlineCommentAction = {
     type: ACTIONS.INLINE_COMMENT_CLEAR_DIRTY_MARK;
 } | {
     type: ACTIONS.CLOSE_COMPONENT;
-    data: {
-        lastClosedPos: number;
-    };
 } | {
     type: ACTIONS.ADD_INLINE_COMMENT;
     data: {
@@ -74,5 +71,4 @@ export type InlineCommentPluginState = {
     bookmark?: SelectionBookmark;
     disallowOnWhitespace: boolean;
     isVisible: boolean;
-    lastClosedPos?: number;
 };

package/dist/types-ts4.5/utils/commands.d.ts

@@ -4,6 +4,7 @@ import type { HigherOrderCommand } from '@atlaskit/editor-common/types';
 /**
  * Creates a filter that checks if the node at a given number of parents above the current
  * selection is of the correct node type.
+ *
  * @param nodeType The node type to compare the nth parent against
  * @param depthAway How many levels above the current node to check against. 0 refers to
  * the current selection's parent, which will be the containing node when the selection

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-core",
-  "version": "188.10.0",
+  "version": "188.10.1",
   "description": "A package contains Atlassian editor core functionality",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -154,7 +154,7 @@
     "@af/editor-libra": "*",
     "@af/integration-testing": "*",
     "@af/visual-regression": "*",
-    "@atlaskit/collab-provider": "9.15.1",
+    "@atlaskit/collab-provider": "9.15.2",
     "@atlaskit/dropdown-menu": "^12.1.0",
     "@atlaskit/editor-extension-dropbox": "^0.4.0",
     "@atlaskit/flag": "^15.2.0",