@atlaskit/editor-plugin-annotation 6.1.7 → 6.1.9

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @atlaskit/editor-plugin-annotation
 
+## 6.1.9
+
+### Patch Changes
+
+- [`ef001bf65d48f`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/ef001bf65d48f) -
+  Remove usage of `platform_editor_toolbar_aifc` inside editor packages - instead rely on checking
+  for new toolbar plugin option, make `enableNewToolbarExperience` mandatory for consumers to opt in
+  to new toolbar experience
+- Updated dependencies
+
+## 6.1.8
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 6.1.7
 
 ### Patch Changes

package/dist/cjs/annotationPlugin.js

@@ -24,9 +24,7 @@ var annotationPlugin = exports.annotationPlugin = function annotationPlugin(_ref
   var annotationProviders = _ref.config,
     api = _ref.api;
   var featureFlags = api === null || api === void 0 || (_api$featureFlags = api.featureFlags) === null || _api$featureFlags === void 0 ? void 0 : _api$featureFlags.sharedState.currentState();
-  var isToolbarAIFCEnabled = Boolean(api === null || api === void 0 ? void 0 : api.toolbar) && (0, _experiments.editorExperiment)('platform_editor_toolbar_aifc', true, {
-    exposure: true
-  });
+  var isToolbarAIFCEnabled = Boolean(api === null || api === void 0 ? void 0 : api.toolbar);
   if (isToolbarAIFCEnabled) {
     var _api$toolbar;
     api === null || api === void 0 || (_api$toolbar = api.toolbar) === null || _api$toolbar === void 0 || _api$toolbar.actions.registerComponents((0, _toolbarComponents.getToolbarComponents)(api, annotationProviders));

package/dist/cjs/editor-commands/index.js

@@ -9,7 +9,6 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _adfSchema = require("@atlaskit/adf-schema");
 var _analytics = require("@atlaskit/editor-common/analytics");
 var _state = require("@atlaskit/editor-prosemirror/state");
-var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _pluginFactory = require("../pm-plugins/plugin-factory");
 var _types = require("../pm-plugins/types");
 var _utils = require("../pm-plugins/utils");
@@ -247,7 +246,7 @@ var setInlineCommentDraftState = exports.setInlineCommentDraftState = function s
     var targetNodeId = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : undefined;
     var isOpeningMediaCommentFromToolbar = arguments.length > 4 ? arguments[4] : undefined;
     var commandAction = getDraftCommandAction(drafting, targetType, targetNodeId, supportedBlockNodes, isOpeningMediaCommentFromToolbar);
-    if ((0, _experiments.editorExperiment)('platform_editor_toolbar_aifc', true)) {
+    if (Boolean(api === null || api === void 0 ? void 0 : api.toolbar)) {
       return function (state, dispatch) {
         var tr = _transform.default.handleDraftState(editorAnalyticsAPI)(drafting, inputMethod)(state.tr, state);
         var newPluginState = commandAction(state);
@@ -289,7 +288,7 @@ var addInlineComment = exports.addInlineComment = function addInlineComment(edit
         }
       };
     };
-    if ((0, _experiments.editorExperiment)('platform_editor_toolbar_aifc', true)) {
+    if (Boolean(editorAPI === null || editorAPI === void 0 ? void 0 : editorAPI.toolbar)) {
       return function (state, dispatch) {
         var tr = _transform.default.addInlineComment(editorAnalyticsAPI, editorAPI)(id, supportedBlockNodes)(state.tr, state);
         tr.setMeta(_utils.inlineCommentPluginKey, commandAction(state));

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

@@ -14,7 +14,6 @@ var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
 var _utils = require("@atlaskit/editor-common/utils");
 var _view = require("@atlaskit/editor-prosemirror/view");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
-var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _editorCommands = require("../editor-commands");
 var _utils2 = require("../editor-commands/utils");
 var _nodeviews = require("../nodeviews");
@@ -273,7 +272,7 @@ var inlineCommentPlugin = exports.inlineCommentPlugin = function inlineCommentPl
             (_options$viewInlineCo = options.viewInlineCommentTraceUFOPress) === null || _options$viewInlineCo === void 0 || _options$viewInlineCo.call(options);
           }
           var api = options.api;
-          if (isDrafting && !view.state.selection.eq(_prevState.selection) && (0, _experiments.editorExperiment)('platform_editor_toolbar_aifc', true)) {
+          if (isDrafting && !view.state.selection.eq(_prevState.selection) && Boolean(api === null || api === void 0 ? void 0 : api.toolbar)) {
             // It is possible that user update selection while having a active draft,
             // so we need to reset the user intent to allow inline text toolbar to be visible
             api === null || api === void 0 || api.core.actions.execute(function (_ref7) {

package/dist/es2019/annotationPlugin.js

@@ -15,9 +15,7 @@ export const annotationPlugin = ({
 }) => {
   var _api$featureFlags, _api$analytics;
   const featureFlags = api === null || api === void 0 ? void 0 : (_api$featureFlags = api.featureFlags) === null || _api$featureFlags === void 0 ? void 0 : _api$featureFlags.sharedState.currentState();
-  const isToolbarAIFCEnabled = Boolean(api === null || api === void 0 ? void 0 : api.toolbar) && editorExperiment('platform_editor_toolbar_aifc', true, {
-    exposure: true
-  });
+  const isToolbarAIFCEnabled = Boolean(api === null || api === void 0 ? void 0 : api.toolbar);
   if (isToolbarAIFCEnabled) {
     var _api$toolbar;
     api === null || api === void 0 ? void 0 : (_api$toolbar = api.toolbar) === null || _api$toolbar === void 0 ? void 0 : _api$toolbar.actions.registerComponents(getToolbarComponents(api, annotationProviders));

package/dist/es2019/editor-commands/index.js

@@ -1,7 +1,6 @@
 import { AnnotationTypes } from '@atlaskit/adf-schema';
 import { INPUT_METHOD, RESOLVE_METHOD } from '@atlaskit/editor-common/analytics';
 import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
-import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { createCommand } from '../pm-plugins/plugin-factory';
 import { ACTIONS } from '../pm-plugins/types';
 import { getPluginState, inlineCommentPluginKey, isSelectionValid, isSupportedBlockNode } from '../pm-plugins/utils';
@@ -202,7 +201,7 @@ export const showInlineCommentForBlockNode = (supportedBlockNodes = []) => (node
 };
 export const setInlineCommentDraftState = (editorAnalyticsAPI, supportedBlockNodes = [], api) => (drafting, inputMethod = INPUT_METHOD.TOOLBAR, targetType = 'inline', targetNodeId = undefined, isOpeningMediaCommentFromToolbar) => {
   const commandAction = getDraftCommandAction(drafting, targetType, targetNodeId, supportedBlockNodes, isOpeningMediaCommentFromToolbar);
-  if (editorExperiment('platform_editor_toolbar_aifc', true)) {
+  if (Boolean(api === null || api === void 0 ? void 0 : api.toolbar)) {
     return (state, dispatch) => {
       const tr = transform.handleDraftState(editorAnalyticsAPI)(drafting, inputMethod)(state.tr, state);
       const newPluginState = commandAction(state);
@@ -242,7 +241,7 @@ export const addInlineComment = (editorAnalyticsAPI, editorAPI) => (id, supporte
       editorState
     }
   });
-  if (editorExperiment('platform_editor_toolbar_aifc', true)) {
+  if (Boolean(editorAPI === null || editorAPI === void 0 ? void 0 : editorAPI.toolbar)) {
     return (state, dispatch) => {
       const tr = transform.addInlineComment(editorAnalyticsAPI, editorAPI)(id, supportedBlockNodes)(state.tr, state);
       tr.setMeta(inlineCommentPluginKey, commandAction(state));

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

@@ -4,7 +4,6 @@ import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { getAnnotationInlineNodeTypes } from '@atlaskit/editor-common/utils';
 import { Decoration, DecorationSet } from '@atlaskit/editor-prosemirror/view';
 import { fg } from '@atlaskit/platform-feature-flags';
-import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { clearDirtyMark, closeComponent, setHoveredAnnotation, setInlineCommentsVisibility, setSelectedAnnotation, flushPendingSelections, updateInlineCommentResolvedState, updateMouseState, setPendingSelectedAnnotation, setInlineCommentDraftState, setInlineCommentsFetched } from '../editor-commands';
 import { resetUserIntent, setUserIntent } from '../editor-commands/utils';
 import { getAnnotationViewClassname, getBlockAnnotationViewClassname } from '../nodeviews';
@@ -215,7 +214,7 @@ export const inlineCommentPlugin = options => {
           const {
             api
           } = options;
-          if (isDrafting && !view.state.selection.eq(_prevState.selection) && editorExperiment('platform_editor_toolbar_aifc', true)) {
+          if (isDrafting && !view.state.selection.eq(_prevState.selection) && Boolean(api === null || api === void 0 ? void 0 : api.toolbar)) {
             // It is possible that user update selection while having a active draft,
             // so we need to reset the user intent to allow inline text toolbar to be visible
             api === null || api === void 0 ? void 0 : api.core.actions.execute(({

package/dist/esm/annotationPlugin.js

@@ -17,9 +17,7 @@ export var annotationPlugin = function annotationPlugin(_ref) {
   var annotationProviders = _ref.config,
     api = _ref.api;
   var featureFlags = api === null || api === void 0 || (_api$featureFlags = api.featureFlags) === null || _api$featureFlags === void 0 ? void 0 : _api$featureFlags.sharedState.currentState();
-  var isToolbarAIFCEnabled = Boolean(api === null || api === void 0 ? void 0 : api.toolbar) && editorExperiment('platform_editor_toolbar_aifc', true, {
-    exposure: true
-  });
+  var isToolbarAIFCEnabled = Boolean(api === null || api === void 0 ? void 0 : api.toolbar);
   if (isToolbarAIFCEnabled) {
     var _api$toolbar;
     api === null || api === void 0 || (_api$toolbar = api.toolbar) === null || _api$toolbar === void 0 || _api$toolbar.actions.registerComponents(getToolbarComponents(api, annotationProviders));

package/dist/esm/editor-commands/index.js

@@ -2,7 +2,6 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import { AnnotationTypes } from '@atlaskit/adf-schema';
 import { INPUT_METHOD, RESOLVE_METHOD } from '@atlaskit/editor-common/analytics';
 import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
-import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { createCommand } from '../pm-plugins/plugin-factory';
 import { ACTIONS } from '../pm-plugins/types';
 import { getPluginState, inlineCommentPluginKey, isSelectionValid, isSupportedBlockNode } from '../pm-plugins/utils';
@@ -240,7 +239,7 @@ export var setInlineCommentDraftState = function setInlineCommentDraftState(edit
     var targetNodeId = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : undefined;
     var isOpeningMediaCommentFromToolbar = arguments.length > 4 ? arguments[4] : undefined;
     var commandAction = getDraftCommandAction(drafting, targetType, targetNodeId, supportedBlockNodes, isOpeningMediaCommentFromToolbar);
-    if (editorExperiment('platform_editor_toolbar_aifc', true)) {
+    if (Boolean(api === null || api === void 0 ? void 0 : api.toolbar)) {
       return function (state, dispatch) {
         var tr = transform.handleDraftState(editorAnalyticsAPI)(drafting, inputMethod)(state.tr, state);
         var newPluginState = commandAction(state);
@@ -282,7 +281,7 @@ export var addInlineComment = function addInlineComment(editorAnalyticsAPI, edit
         }
       };
     };
-    if (editorExperiment('platform_editor_toolbar_aifc', true)) {
+    if (Boolean(editorAPI === null || editorAPI === void 0 ? void 0 : editorAPI.toolbar)) {
       return function (state, dispatch) {
         var tr = transform.addInlineComment(editorAnalyticsAPI, editorAPI)(id, supportedBlockNodes)(state.tr, state);
         tr.setMeta(inlineCommentPluginKey, commandAction(state));

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

@@ -7,7 +7,6 @@ import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { getAnnotationInlineNodeTypes } from '@atlaskit/editor-common/utils';
 import { Decoration, DecorationSet } from '@atlaskit/editor-prosemirror/view';
 import { fg } from '@atlaskit/platform-feature-flags';
-import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { clearDirtyMark, closeComponent, setHoveredAnnotation, setInlineCommentsVisibility, setSelectedAnnotation, flushPendingSelections, updateInlineCommentResolvedState, updateMouseState, setPendingSelectedAnnotation, setInlineCommentDraftState, setInlineCommentsFetched } from '../editor-commands';
 import { resetUserIntent, setUserIntent } from '../editor-commands/utils';
 import { getAnnotationViewClassname, getBlockAnnotationViewClassname } from '../nodeviews';
@@ -266,7 +265,7 @@ export var inlineCommentPlugin = function inlineCommentPlugin(options) {
             (_options$viewInlineCo = options.viewInlineCommentTraceUFOPress) === null || _options$viewInlineCo === void 0 || _options$viewInlineCo.call(options);
           }
           var api = options.api;
-          if (isDrafting && !view.state.selection.eq(_prevState.selection) && editorExperiment('platform_editor_toolbar_aifc', true)) {
+          if (isDrafting && !view.state.selection.eq(_prevState.selection) && Boolean(api === null || api === void 0 ? void 0 : api.toolbar)) {
             // It is possible that user update selection while having a active draft,
             // so we need to reset the user intent to allow inline text toolbar to be visible
             api === null || api === void 0 || api.core.actions.execute(function (_ref7) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-annotation",
-	"version": "6.1.7",
+	"version": "6.1.9",
 	"description": "Annotation plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -33,20 +33,20 @@
 		"@atlaskit/editor-plugin-connectivity": "^6.0.0",
 		"@atlaskit/editor-plugin-editor-viewmode-effects": "^6.0.0",
 		"@atlaskit/editor-plugin-feature-flags": "^5.0.0",
-		"@atlaskit/editor-plugin-toolbar": "^3.1.0",
+		"@atlaskit/editor-plugin-toolbar": "^3.2.0",
 		"@atlaskit/editor-plugin-user-intent": "^4.0.0",
 		"@atlaskit/editor-prosemirror": "7.0.0",
-		"@atlaskit/editor-toolbar": "^0.14.0",
+		"@atlaskit/editor-toolbar": "^0.15.0",
 		"@atlaskit/editor-toolbar-model": "^0.2.0",
 		"@atlaskit/icon": "^28.5.0",
 		"@atlaskit/onboarding": "^14.4.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
-		"@atlaskit/tmp-editor-statsig": "^13.5.0",
+		"@atlaskit/tmp-editor-statsig": "^13.10.0",
 		"@babel/runtime": "^7.0.0",
 		"react-intl-next": "npm:react-intl@^5.18.1"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^110.8.0",
+		"@atlaskit/editor-common": "^110.10.0",
 		"react": "^18.2.0",
 		"react-dom": "^18.2.0"
 	},