@atlaskit/editor-plugin-annotation 2.9.9 → 2.9.11

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @atlaskit/editor-plugin-annotation
 
+## 2.9.11
+
+### Patch Changes
+
+- [#179350](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/179350)
+  [`9395a7b026838`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/9395a7b026838) -
+  Clean up platform_editor_fix_toolbar_comment_jump
+
+## 2.9.10
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 2.9.9
 
 ### Patch Changes

package/dist/cjs/annotationPlugin.js

@@ -9,7 +9,6 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _react = _interopRequireDefault(require("react"));
 var _hooks = require("@atlaskit/editor-common/hooks");
 var _useSharedPluginStateSelector = require("@atlaskit/editor-common/use-shared-plugin-state-selector");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _editorCommands = require("./editor-commands");
 var _annotationMark = require("./nodeviews/annotationMark");
@@ -81,9 +80,6 @@ var annotationPlugin = exports.annotationPlugin = function annotationPlugin(_ref
     },
     pluginsOptions: {
       floatingToolbar: function floatingToolbar(state) {
-        if (!(0, _platformFeatureFlags.fg)('platform_editor_fix_toolbar_comment_jump')) {
-          return;
-        }
         var pluginState = (0, _utils.getPluginState)(state);
         var bookmark = pluginState === null || pluginState === void 0 ? void 0 : pluginState.bookmark;
         if ((0, _toolbar.shouldSuppressFloatingToolbar)({

package/dist/cjs/pm-plugins/toolbar.js

@@ -69,7 +69,6 @@ var buildToolbar = exports.buildToolbar = function buildToolbar(editorAnalyticsA
       createCommentExperience = _ref2.createCommentExperience,
       annotationManager = _ref2.annotationManager,
       onCommentButtonMount = _ref2.onCommentButtonMount;
-    var schema = state.schema;
     var selectionValid = (0, _utils2.isSelectionValid)(state);
     var isMediaSelected = (0, _mediaSingle.currentMediaNodeWithPos)(state);
 
@@ -183,20 +182,12 @@ var buildToolbar = exports.buildToolbar = function buildToolbar(editorAnalyticsA
       },
       supportsViewMode: true // TODO: MODES-3950 - Clean up this floating toolbar view mode logic,
     };
-    var annotation = schema.marks.annotation;
-    var validNodes = Object.keys(schema.nodes).reduce(function (acc, current) {
-      var type = schema.nodes[current];
-      if (type.allowsMarkType(annotation)) {
-        acc.push(type);
-      }
-      return acc;
-    }, []);
     var toolbarTitle = intl.formatMessage(_messages.annotationMessages.toolbar);
     var calcToolbarPosition = isToolbarAbove ? _utils.calculateToolbarPositionAboveSelection : _utils.calculateToolbarPositionTrackHead;
     var onPositionCalculated = calcToolbarPosition(toolbarTitle);
     return {
       title: toolbarTitle,
-      nodeType: (0, _platformFeatureFlags.fg)('platform_editor_fix_toolbar_comment_jump') ? getValidNodes(state) : validNodes,
+      nodeType: getValidNodes(state),
       items: [createComment],
       onPositionCalculated: onPositionCalculated,
       pluginName: 'annotation'

package/dist/es2019/annotationPlugin.js

@@ -1,7 +1,6 @@
 import React from 'react';
 import { sharedPluginStateHookMigratorFactory, useSharedPluginState } from '@atlaskit/editor-common/hooks';
 import { useSharedPluginStateSelector } from '@atlaskit/editor-common/use-shared-plugin-state-selector';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { setInlineCommentDraftState, showInlineCommentForBlockNode } from './editor-commands';
 import { annotationWithToDOMFix } from './nodeviews/annotationMark';
@@ -71,9 +70,6 @@ export const annotationPlugin = ({
     }],
     pluginsOptions: {
       floatingToolbar(state) {
-        if (!fg('platform_editor_fix_toolbar_comment_jump')) {
-          return;
-        }
         const pluginState = getPluginState(state);
         const bookmark = pluginState === null || pluginState === void 0 ? void 0 : pluginState.bookmark;
         if (shouldSuppressFloatingToolbar({

package/dist/es2019/pm-plugins/toolbar.js

@@ -67,9 +67,6 @@ export const buildToolbar = editorAnalyticsAPI => ({
   onCommentButtonMount
 }) => {
   var _api$connectivity, _api$connectivity$sha, _api$connectivity$sha2;
-  const {
-    schema
-  } = state;
   const selectionValid = isSelectionValid(state);
   const isMediaSelected = currentMediaNodeWithPos(state);
 
@@ -181,22 +178,12 @@ export const buildToolbar = editorAnalyticsAPI => ({
     },
     supportsViewMode: true // TODO: MODES-3950 - Clean up this floating toolbar view mode logic,
   };
-  const {
-    annotation
-  } = schema.marks;
-  const validNodes = Object.keys(schema.nodes).reduce((acc, current) => {
-    const type = schema.nodes[current];
-    if (type.allowsMarkType(annotation)) {
-      acc.push(type);
-    }
-    return acc;
-  }, []);
   const toolbarTitle = intl.formatMessage(annotationMessages.toolbar);
   const calcToolbarPosition = isToolbarAbove ? calculateToolbarPositionAboveSelection : calculateToolbarPositionTrackHead;
   const onPositionCalculated = calcToolbarPosition(toolbarTitle);
   return {
     title: toolbarTitle,
-    nodeType: fg('platform_editor_fix_toolbar_comment_jump') ? getValidNodes(state) : validNodes,
+    nodeType: getValidNodes(state),
     items: [createComment],
     onPositionCalculated,
     pluginName: 'annotation'

package/dist/esm/annotationPlugin.js

@@ -4,7 +4,6 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 import React from 'react';
 import { sharedPluginStateHookMigratorFactory, useSharedPluginState } from '@atlaskit/editor-common/hooks';
 import { useSharedPluginStateSelector } from '@atlaskit/editor-common/use-shared-plugin-state-selector';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { setInlineCommentDraftState, showInlineCommentForBlockNode } from './editor-commands';
 import { annotationWithToDOMFix } from './nodeviews/annotationMark';
@@ -74,9 +73,6 @@ export var annotationPlugin = function annotationPlugin(_ref) {
     },
     pluginsOptions: {
       floatingToolbar: function floatingToolbar(state) {
-        if (!fg('platform_editor_fix_toolbar_comment_jump')) {
-          return;
-        }
         var pluginState = getPluginState(state);
         var bookmark = pluginState === null || pluginState === void 0 ? void 0 : pluginState.bookmark;
         if (shouldSuppressFloatingToolbar({

package/dist/esm/pm-plugins/toolbar.js

@@ -62,7 +62,6 @@ export var buildToolbar = function buildToolbar(editorAnalyticsAPI) {
       createCommentExperience = _ref2.createCommentExperience,
       annotationManager = _ref2.annotationManager,
       onCommentButtonMount = _ref2.onCommentButtonMount;
-    var schema = state.schema;
     var selectionValid = isSelectionValid(state);
     var isMediaSelected = currentMediaNodeWithPos(state);
 
@@ -176,20 +175,12 @@ export var buildToolbar = function buildToolbar(editorAnalyticsAPI) {
       },
       supportsViewMode: true // TODO: MODES-3950 - Clean up this floating toolbar view mode logic,
     };
-    var annotation = schema.marks.annotation;
-    var validNodes = Object.keys(schema.nodes).reduce(function (acc, current) {
-      var type = schema.nodes[current];
-      if (type.allowsMarkType(annotation)) {
-        acc.push(type);
-      }
-      return acc;
-    }, []);
     var toolbarTitle = intl.formatMessage(annotationMessages.toolbar);
     var calcToolbarPosition = isToolbarAbove ? calculateToolbarPositionAboveSelection : calculateToolbarPositionTrackHead;
     var onPositionCalculated = calcToolbarPosition(toolbarTitle);
     return {
       title: toolbarTitle,
-      nodeType: fg('platform_editor_fix_toolbar_comment_jump') ? getValidNodes(state) : validNodes,
+      nodeType: getValidNodes(state),
       items: [createComment],
       onPositionCalculated: onPositionCalculated,
       pluginName: 'annotation'

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-annotation",
-	"version": "2.9.9",
+	"version": "2.9.11",
 	"description": "Annotation plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -9,8 +9,7 @@
 	},
 	"atlassian": {
 		"team": "Editor: AI",
-		"singleton": true,
-		"runReact18": true
+		"singleton": true
 	},
 	"repository": "https://bitbucket.org/atlassian/atlassian-frontend-mirror",
 	"main": "dist/cjs/index.js",
@@ -33,16 +32,16 @@
 	"dependencies": {
 		"@atlaskit/adf-schema": "^47.6.0",
 		"@atlaskit/analytics-next": "^11.1.0",
-		"@atlaskit/editor-common": "^107.0.0",
+		"@atlaskit/editor-common": "^107.3.0",
 		"@atlaskit/editor-plugin-analytics": "^2.3.0",
 		"@atlaskit/editor-plugin-connectivity": "^2.0.0",
 		"@atlaskit/editor-plugin-editor-viewmode-effects": "^2.0.0",
 		"@atlaskit/editor-plugin-feature-flags": "^1.4.0",
 		"@atlaskit/editor-prosemirror": "7.0.0",
-		"@atlaskit/icon": "^27.0.0",
+		"@atlaskit/icon": "^27.2.0",
 		"@atlaskit/onboarding": "^14.2.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
-		"@atlaskit/tmp-editor-statsig": "^7.1.0",
+		"@atlaskit/tmp-editor-statsig": "^8.5.0",
 		"@babel/runtime": "^7.0.0"
 	},
 	"peerDependencies": {
@@ -107,9 +106,6 @@
 		"platform_editor_listen_for_annotation_clicks": {
 			"type": "boolean"
 		},
-		"platform_editor_fix_toolbar_comment_jump": {
-			"type": "boolean"
-		},
 		"platform_editor_annotation_selected_annotation": {
 			"type": "boolean"
 		},