@atlaskit/editor-plugin-annotation 1.14.2 → 1.14.3

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @atlaskit/editor-plugin-annotation
 
+## 1.14.3
+
+### Patch Changes
+
+- [#118402](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/118402)
+  [`efc9db93eefe8`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/efc9db93eefe8) -
+  Cleanup flag to fix comments on media draft bug
+
 ## 1.14.2
 
 ### Patch Changes

package/dist/cjs/pm-plugins/plugin-factory.js

@@ -9,7 +9,6 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _utils = require("@atlaskit/editor-common/utils");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _view = require("@atlaskit/editor-prosemirror/view");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _utils2 = require("../utils");
 var _reducer = _interopRequireDefault(require("./reducer"));
 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; }
@@ -29,11 +28,6 @@ var handleDocChanged = function handleDocChanged(tr, prevPluginState) {
  * 2. if the current selection and bookmark selection are different
  */
 var shouldClearBookMarkCheck = exports.shouldClearBookMarkCheck = function shouldClearBookMarkCheck(tr, editorState, bookmark) {
-  // https://switcheroo.atlassian.com/changes/confluence/platform.editor.comments-on-media.bug.preserve-draft_i3vqb
-  // the existing log will always clear bookmark
-  if (!(0, _platformFeatureFlags.getBooleanFF)('platform.editor.comments-on-media.bug.preserve-draft_i3vqb')) {
-    return true;
-  }
   if (editorState.selection.empty || !bookmark) {
     return true;
   } else if (editorState.selection instanceof _state.NodeSelection) {

package/dist/es2019/pm-plugins/plugin-factory.js

@@ -1,7 +1,6 @@
 import { pluginFactory } from '@atlaskit/editor-common/utils';
 import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
 import { DecorationSet } from '@atlaskit/editor-prosemirror/view';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { decorationKey, findAnnotationsInSelection, inlineCommentPluginKey, isBlockNodeAnnotationsSelected, isSelectedAnnotationsChanged } from '../utils';
 import reducer from './reducer';
 const handleDocChanged = (tr, prevPluginState) => {
@@ -20,11 +19,6 @@ const handleDocChanged = (tr, prevPluginState) => {
  * 2. if the current selection and bookmark selection are different
  */
 export const shouldClearBookMarkCheck = (tr, editorState, bookmark) => {
-  // https://switcheroo.atlassian.com/changes/confluence/platform.editor.comments-on-media.bug.preserve-draft_i3vqb
-  // the existing log will always clear bookmark
-  if (!getBooleanFF('platform.editor.comments-on-media.bug.preserve-draft_i3vqb')) {
-    return true;
-  }
   if (editorState.selection.empty || !bookmark) {
     return true;
   } else if (editorState.selection instanceof NodeSelection) {

package/dist/esm/pm-plugins/plugin-factory.js

@@ -4,7 +4,6 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 import { pluginFactory } from '@atlaskit/editor-common/utils';
 import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
 import { DecorationSet } from '@atlaskit/editor-prosemirror/view';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { decorationKey, findAnnotationsInSelection, inlineCommentPluginKey, isBlockNodeAnnotationsSelected, isSelectedAnnotationsChanged } from '../utils';
 import reducer from './reducer';
 var handleDocChanged = function handleDocChanged(tr, prevPluginState) {
@@ -22,11 +21,6 @@ var handleDocChanged = function handleDocChanged(tr, prevPluginState) {
  * 2. if the current selection and bookmark selection are different
  */
 export var shouldClearBookMarkCheck = function shouldClearBookMarkCheck(tr, editorState, bookmark) {
-  // https://switcheroo.atlassian.com/changes/confluence/platform.editor.comments-on-media.bug.preserve-draft_i3vqb
-  // the existing log will always clear bookmark
-  if (!getBooleanFF('platform.editor.comments-on-media.bug.preserve-draft_i3vqb')) {
-    return true;
-  }
   if (editorState.selection.empty || !bookmark) {
     return true;
   } else if (editorState.selection instanceof NodeSelection) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-annotation",
-	"version": "1.14.2",
+	"version": "1.14.3",
 	"description": "Annotation plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -33,7 +33,7 @@
 	},
 	"dependencies": {
 		"@atlaskit/adf-schema": "^39.0.3",
-		"@atlaskit/editor-common": "^84.3.0",
+		"@atlaskit/editor-common": "^84.5.0",
 		"@atlaskit/editor-plugin-analytics": "^1.4.0",
 		"@atlaskit/editor-plugin-editor-viewmode-effects": "^1.0.0",
 		"@atlaskit/editor-plugin-feature-flags": "^1.1.0",
@@ -95,9 +95,6 @@
 		},
 		"editor_inline_comments_on_inline_nodes": {
 			"type": "boolean"
-		},
-		"platform.editor.comments-on-media.bug.preserve-draft_i3vqb": {
-			"type": "boolean"
 		}
 	}
 }