@atlaskit/editor-plugin-annotation 6.2.6 → 6.2.8

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @atlaskit/editor-plugin-annotation
 
+## 6.2.8
+
+### Patch Changes
+
+- [`fecf1d10a2282`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/fecf1d10a2282) -
+  ED-29579 Cleaned up platform_editor_fix_inline_comment_reopen
+- Updated dependencies
+
+## 6.2.7
+
+### Patch Changes
+
+- [`749a0f6a088b9`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/749a0f6a088b9) -
+  ED-29602 - stop annotationplugin breaking hydration
+- Updated dependencies
+
 ## 6.2.6
 
 ### Patch Changes

package/dist/cjs/annotationPlugin.js

@@ -7,7 +7,9 @@ Object.defineProperty(exports, "__esModule", {
 exports.annotationPlugin = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = _interopRequireDefault(require("react"));
+var _coreUtils = require("@atlaskit/editor-common/core-utils");
 var _hooks = require("@atlaskit/editor-common/hooks");
+var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _editorCommands = require("./editor-commands");
 var _annotationMark = require("./nodeviews/annotationMark");
@@ -132,7 +134,7 @@ var annotationPlugin = exports.annotationPlugin = function annotationPlugin(_ref
     contentComponent: function contentComponent(_ref3) {
       var editorView = _ref3.editorView,
         dispatchAnalyticsEvent = _ref3.dispatchAnalyticsEvent;
-      if (!annotationProviders || !editorView) {
+      if (!annotationProviders || !editorView || (0, _coreUtils.isSSR)() && (0, _expValEquals.expValEquals)('platform_editor_hydratable_ui', 'isEnabled', true)) {
         return null;
       }
       return /*#__PURE__*/_react.default.createElement(AnnotationContentComponent, {

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

@@ -406,9 +406,6 @@ var inlineCommentPlugin = exports.inlineCommentPlugin = function inlineCommentPl
         },
         click: function click(view, event) {
           var _event$target$closest, _pluginState$selected;
-          if (!(0, _platformFeatureFlags.fg)('platform_editor_listen_for_annotation_clicks')) {
-            return false;
-          }
           if (!(event.target instanceof HTMLElement)) {
             return false;
           }

package/dist/cjs/ui/InlineCommentView.js

@@ -14,7 +14,6 @@ var _hooks = require("@atlaskit/editor-common/hooks");
 var _useSharedPluginStateSelector = require("@atlaskit/editor-common/use-shared-plugin-state-selector");
 var _utils = require("@atlaskit/editor-common/utils");
 var _utils2 = require("@atlaskit/editor-prosemirror/utils");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _editorCommands = require("../editor-commands");
 var _utils3 = require("../pm-plugins/utils");
@@ -50,7 +49,6 @@ var selector = function selector(states) {
   };
 };
 function InlineCommentView(_ref) {
-  var _getPluginState;
   var providers = _ref.providers,
     editorView = _ref.editorView,
     editorAnalyticsAPI = _ref.editorAnalyticsAPI,
@@ -65,13 +63,12 @@ function InlineCommentView(_ref) {
     ViewComponent = inlineCommentProvider.viewComponent;
   var _useSharedPluginState = (0, _hooks.useSharedPluginStateWithSelector)(editorAPI, ['annotation'], selector),
     annotations = _useSharedPluginState.annotations,
-    _bookmark = _useSharedPluginState.bookmark,
+    bookmark = _useSharedPluginState.bookmark,
     isInlineCommentViewClosed = _useSharedPluginState.isInlineCommentViewClosed,
     isOpeningMediaCommentFromToolbar = _useSharedPluginState.isOpeningMediaCommentFromToolbar,
     selectAnnotationMethod = _useSharedPluginState.selectAnnotationMethod,
     selectedAnnotations = _useSharedPluginState.selectedAnnotations,
     isAnnotationManagerEnabled = _useSharedPluginState.isAnnotationManagerEnabled;
-  var bookmark = (0, _platformFeatureFlags.fg)('platform_editor_fix_inline_comment_reopen') ? (_getPluginState = (0, _utils3.getPluginState)(state)) === null || _getPluginState === void 0 ? void 0 : _getPluginState.bookmark : _bookmark;
   var annotationsList = (0, _utils3.getAllAnnotations)(editorView.state.doc);
   var selection = (0, _utils3.getSelectionPositions)(state, bookmark);
   var position = findPosForDOM(selection);

package/dist/es2019/annotationPlugin.js

@@ -1,5 +1,7 @@
 import React from 'react';
+import { isSSR } from '@atlaskit/editor-common/core-utils';
 import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { setInlineCommentDraftState, showInlineCommentForBlockNode } from './editor-commands';
 import { annotationWithToDOMFix } from './nodeviews/annotationMark';
@@ -125,7 +127,7 @@ export const annotationPlugin = ({
       editorView,
       dispatchAnalyticsEvent
     }) {
-      if (!annotationProviders || !editorView) {
+      if (!annotationProviders || !editorView || isSSR() && expValEquals('platform_editor_hydratable_ui', 'isEnabled', true)) {
         return null;
       }
       return /*#__PURE__*/React.createElement(AnnotationContentComponent, {

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

@@ -350,9 +350,6 @@ export const inlineCommentPlugin = options => {
         },
         click: (view, event) => {
           var _event$target$closest, _pluginState$selected;
-          if (!fg('platform_editor_listen_for_annotation_clicks')) {
-            return false;
-          }
           if (!(event.target instanceof HTMLElement)) {
             return false;
           }

package/dist/es2019/ui/InlineCommentView.js

@@ -5,10 +5,9 @@ import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks'
 import { useSharedPluginStateSelector } from '@atlaskit/editor-common/use-shared-plugin-state-selector';
 import { getAnnotationInlineNodeTypes, getRangeInlineNodeNames } from '@atlaskit/editor-common/utils';
 import { findDomRefAtPos } from '@atlaskit/editor-prosemirror/utils';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { closeComponent, createAnnotation, removeInlineCommentNearSelection, setInlineCommentDraftState, updateInlineCommentResolvedState } from '../editor-commands';
-import { getAllAnnotations, getAnnotationViewKey, getPluginState, getSelectionPositions } from '../pm-plugins/utils';
+import { getAllAnnotations, getAnnotationViewKey, getSelectionPositions } from '../pm-plugins/utils';
 import { AnnotationTestIds } from '../types';
 import { AnnotationViewWrapper } from './AnnotationViewWrapper';
 const findPosForDOM = sel => {
@@ -46,7 +45,6 @@ export function InlineCommentView({
   editorAPI,
   dispatchAnalyticsEvent
 }) {
-  var _getPluginState;
   // As inlineComment is the only annotation present, this function is not generic
   const {
     inlineComment: inlineCommentProvider
@@ -62,14 +60,13 @@ export function InlineCommentView({
   } = inlineCommentProvider;
   const {
     annotations,
-    bookmark: _bookmark,
+    bookmark,
     isInlineCommentViewClosed,
     isOpeningMediaCommentFromToolbar,
     selectAnnotationMethod,
     selectedAnnotations,
     isAnnotationManagerEnabled
   } = useSharedPluginStateWithSelector(editorAPI, ['annotation'], selector);
-  const bookmark = fg('platform_editor_fix_inline_comment_reopen') ? (_getPluginState = getPluginState(state)) === null || _getPluginState === void 0 ? void 0 : _getPluginState.bookmark : _bookmark;
   const annotationsList = getAllAnnotations(editorView.state.doc);
   const selection = getSelectionPositions(state, bookmark);
   const position = findPosForDOM(selection);

package/dist/esm/annotationPlugin.js

@@ -2,7 +2,9 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
 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) { _defineProperty(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; }
 import React from 'react';
+import { isSSR } from '@atlaskit/editor-common/core-utils';
 import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { setInlineCommentDraftState, showInlineCommentForBlockNode } from './editor-commands';
 import { annotationWithToDOMFix } from './nodeviews/annotationMark';
@@ -125,7 +127,7 @@ export var annotationPlugin = function annotationPlugin(_ref) {
     contentComponent: function contentComponent(_ref3) {
       var editorView = _ref3.editorView,
         dispatchAnalyticsEvent = _ref3.dispatchAnalyticsEvent;
-      if (!annotationProviders || !editorView) {
+      if (!annotationProviders || !editorView || isSSR() && expValEquals('platform_editor_hydratable_ui', 'isEnabled', true)) {
         return null;
       }
       return /*#__PURE__*/React.createElement(AnnotationContentComponent, {

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

@@ -399,9 +399,6 @@ export var inlineCommentPlugin = function inlineCommentPlugin(options) {
         },
         click: function click(view, event) {
           var _event$target$closest, _pluginState$selected;
-          if (!fg('platform_editor_listen_for_annotation_clicks')) {
-            return false;
-          }
           if (!(event.target instanceof HTMLElement)) {
             return false;
           }

package/dist/esm/ui/InlineCommentView.js

@@ -6,10 +6,9 @@ import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks'
 import { useSharedPluginStateSelector } from '@atlaskit/editor-common/use-shared-plugin-state-selector';
 import { getAnnotationInlineNodeTypes, getRangeInlineNodeNames } from '@atlaskit/editor-common/utils';
 import { findDomRefAtPos } from '@atlaskit/editor-prosemirror/utils';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { closeComponent, createAnnotation, removeInlineCommentNearSelection, setInlineCommentDraftState, updateInlineCommentResolvedState } from '../editor-commands';
-import { getAllAnnotations, getAnnotationViewKey, getPluginState, getSelectionPositions } from '../pm-plugins/utils';
+import { getAllAnnotations, getAnnotationViewKey, getSelectionPositions } from '../pm-plugins/utils';
 import { AnnotationTestIds } from '../types';
 import { AnnotationViewWrapper } from './AnnotationViewWrapper';
 var findPosForDOM = function findPosForDOM(sel) {
@@ -41,7 +40,6 @@ var selector = function selector(states) {
   };
 };
 export function InlineCommentView(_ref) {
-  var _getPluginState;
   var providers = _ref.providers,
     editorView = _ref.editorView,
     editorAnalyticsAPI = _ref.editorAnalyticsAPI,
@@ -56,13 +54,12 @@ export function InlineCommentView(_ref) {
     ViewComponent = inlineCommentProvider.viewComponent;
   var _useSharedPluginState = useSharedPluginStateWithSelector(editorAPI, ['annotation'], selector),
     annotations = _useSharedPluginState.annotations,
-    _bookmark = _useSharedPluginState.bookmark,
+    bookmark = _useSharedPluginState.bookmark,
     isInlineCommentViewClosed = _useSharedPluginState.isInlineCommentViewClosed,
     isOpeningMediaCommentFromToolbar = _useSharedPluginState.isOpeningMediaCommentFromToolbar,
     selectAnnotationMethod = _useSharedPluginState.selectAnnotationMethod,
     selectedAnnotations = _useSharedPluginState.selectedAnnotations,
     isAnnotationManagerEnabled = _useSharedPluginState.isAnnotationManagerEnabled;
-  var bookmark = fg('platform_editor_fix_inline_comment_reopen') ? (_getPluginState = getPluginState(state)) === null || _getPluginState === void 0 ? void 0 : _getPluginState.bookmark : _bookmark;
   var annotationsList = getAllAnnotations(editorView.state.doc);
   var selection = getSelectionPositions(state, bookmark);
   var position = findPosForDOM(selection);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-annotation",
-	"version": "6.2.6",
+	"version": "6.2.8",
 	"description": "Annotation plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -41,12 +41,12 @@
 		"@atlaskit/icon": "^28.5.0",
 		"@atlaskit/onboarding": "^14.4.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
-		"@atlaskit/tmp-editor-statsig": "^13.22.0",
+		"@atlaskit/tmp-editor-statsig": "^13.25.0",
 		"@babel/runtime": "^7.0.0",
 		"react-intl-next": "npm:react-intl@^5.18.1"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^110.19.0",
+		"@atlaskit/editor-common": "^110.20.0",
 		"react": "^18.2.0",
 		"react-dom": "^18.2.0"
 	},
@@ -100,18 +100,12 @@
 		"editor_inline_comments_on_inline_nodes": {
 			"type": "boolean"
 		},
-		"platform_editor_listen_for_annotation_clicks": {
-			"type": "boolean"
-		},
 		"platform_editor_annotation_selected_annotation": {
 			"type": "boolean"
 		},
 		"confluence_frontend_preload_inline_comment_editor": {
 			"type": "boolean"
 		},
-		"platform_editor_fix_inline_comment_reopen": {
-			"type": "boolean"
-		},
 		"confluence_frontend_new_dangling_comments_ux": {
 			"type": "boolean"
 		}