@atlaskit/editor-plugin-annotation 1.25.6 → 1.26.0

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @atlaskit/editor-plugin-annotation
 
+## 1.26.0
+
+### Minor Changes
+
+- [#173684](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/173684)
+  [`e022c83d84bd3`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/e022c83d84bd3) -
+  Fix errors caused by not checking for undefined annotation toolbar
+
+## 1.25.7
+
+### Patch Changes
+
+- [#172933](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/172933)
+  [`8323af2381d00`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/8323af2381d00) -
+  [ux] Arranges items in the Selection toolbar under the Contextual toolbar experiment flag
+- Updated dependencies
+
 ## 1.25.6
 
 ### Patch Changes

package/dist/cjs/annotationPlugin.js

@@ -11,16 +11,20 @@ Object.defineProperty(exports, "AnnotationUpdateEmitter", {
   }
 });
 exports.annotationPlugin = void 0;
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = _interopRequireDefault(require("react"));
 var _adfSchema = require("@atlaskit/adf-schema");
 var _annotation = require("@atlaskit/editor-common/annotation");
 var _hooks = require("@atlaskit/editor-common/hooks");
+var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _editorCommands = require("./editor-commands");
 var _inlineComment = require("./pm-plugins/inline-comment");
 var _keymap = require("./pm-plugins/keymap");
 var _toolbar = require("./pm-plugins/toolbar");
 var _utils = require("./pm-plugins/utils");
 var _InlineCommentView = require("./ui/InlineCommentView");
+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) { (0, _defineProperty2.default)(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; }
 var annotationPlugin = exports.annotationPlugin = function annotationPlugin(_ref) {
   var _api$featureFlags, _api$analytics;
   var annotationProviders = _ref.config,
@@ -88,12 +92,19 @@ var annotationPlugin = exports.annotationPlugin = function annotationPlugin(_ref
         if (pluginState && pluginState.isVisible && !pluginState.bookmark && !pluginState.mouseData.isSelecting) {
           var _api$analytics4;
           var isToolbarAbove = annotationProviders.inlineComment.isToolbarAbove;
-          return (0, _toolbar.buildToolbar)(api === null || api === void 0 || (_api$analytics4 = api.analytics) === null || _api$analytics4 === void 0 ? void 0 : _api$analytics4.actions)({
+          var toolbarConfig = (0, _toolbar.buildToolbar)(api === null || api === void 0 || (_api$analytics4 = api.analytics) === null || _api$analytics4 === void 0 ? void 0 : _api$analytics4.actions)({
             state: state,
             intl: intl,
             isToolbarAbove: isToolbarAbove,
             api: api
           });
+          if (!toolbarConfig) {
+            return undefined;
+          } else {
+            return _objectSpread(_objectSpread({}, toolbarConfig), {}, {
+              rank: (0, _experiments.editorExperiment)('contextual_formatting_toolbar', true) ? 1 : undefined
+            });
+          }
         }
       }
     },

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

@@ -70,7 +70,9 @@ var buildToolbar = exports.buildToolbar = function buildToolbar(editorAnalyticsA
     var commentDisabledMessage = intl.formatMessage((0, _platformFeatureFlags.fg)('editor_inline_comments_on_inline_nodes') ? _messages.annotationMessages.createCommentDisabled : _messages.annotationMessages.createCommentInvalid);
     var createComment = {
       type: 'button',
-      showTitle: true,
+      showTitle: (0, _experiments.editorExperiment)('contextual_formatting_toolbar', true, {
+        exposure: true
+      }) ? false : true,
       disabled: selectionValid === _types.AnnotationSelectionType.DISABLED,
       testId: _types.AnnotationTestIds.floatingToolbarCreateButton,
       icon: _comment.default,

package/dist/es2019/annotationPlugin.js

@@ -2,6 +2,7 @@ import React from 'react';
 import { annotation } from '@atlaskit/adf-schema';
 import { AnnotationUpdateEmitter } from '@atlaskit/editor-common/annotation';
 import { useSharedPluginState } from '@atlaskit/editor-common/hooks';
+import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { setInlineCommentDraftState, showInlineCommentForBlockNode } from './editor-commands';
 import { inlineCommentPlugin } from './pm-plugins/inline-comment';
 import { keymapPlugin } from './pm-plugins/keymap';
@@ -77,12 +78,20 @@ export const annotationPlugin = ({
           const {
             isToolbarAbove
           } = annotationProviders.inlineComment;
-          return buildToolbar(api === null || api === void 0 ? void 0 : (_api$analytics4 = api.analytics) === null || _api$analytics4 === void 0 ? void 0 : _api$analytics4.actions)({
+          const toolbarConfig = buildToolbar(api === null || api === void 0 ? void 0 : (_api$analytics4 = api.analytics) === null || _api$analytics4 === void 0 ? void 0 : _api$analytics4.actions)({
             state,
             intl,
             isToolbarAbove,
             api
           });
+          if (!toolbarConfig) {
+            return undefined;
+          } else {
+            return {
+              ...toolbarConfig,
+              rank: editorExperiment('contextual_formatting_toolbar', true) ? 1 : undefined
+            };
+          }
         }
       }
     },

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

@@ -62,7 +62,9 @@ export const buildToolbar = editorAnalyticsAPI => ({
   const commentDisabledMessage = intl.formatMessage(fg('editor_inline_comments_on_inline_nodes') ? annotationMessages.createCommentDisabled : annotationMessages.createCommentInvalid);
   const createComment = {
     type: 'button',
-    showTitle: true,
+    showTitle: editorExperiment('contextual_formatting_toolbar', true, {
+      exposure: true
+    }) ? false : true,
     disabled: selectionValid === AnnotationSelectionType.DISABLED,
     testId: AnnotationTestIds.floatingToolbarCreateButton,
     icon: CommentIcon,

package/dist/esm/annotationPlugin.js

@@ -1,7 +1,11 @@
+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 { annotation } from '@atlaskit/adf-schema';
 import { AnnotationUpdateEmitter } from '@atlaskit/editor-common/annotation';
 import { useSharedPluginState } from '@atlaskit/editor-common/hooks';
+import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { setInlineCommentDraftState, showInlineCommentForBlockNode } from './editor-commands';
 import { inlineCommentPlugin } from './pm-plugins/inline-comment';
 import { keymapPlugin } from './pm-plugins/keymap';
@@ -75,12 +79,19 @@ export var annotationPlugin = function annotationPlugin(_ref) {
         if (pluginState && pluginState.isVisible && !pluginState.bookmark && !pluginState.mouseData.isSelecting) {
           var _api$analytics4;
           var isToolbarAbove = annotationProviders.inlineComment.isToolbarAbove;
-          return buildToolbar(api === null || api === void 0 || (_api$analytics4 = api.analytics) === null || _api$analytics4 === void 0 ? void 0 : _api$analytics4.actions)({
+          var toolbarConfig = buildToolbar(api === null || api === void 0 || (_api$analytics4 = api.analytics) === null || _api$analytics4 === void 0 ? void 0 : _api$analytics4.actions)({
             state: state,
             intl: intl,
             isToolbarAbove: isToolbarAbove,
             api: api
           });
+          if (!toolbarConfig) {
+            return undefined;
+          } else {
+            return _objectSpread(_objectSpread({}, toolbarConfig), {}, {
+              rank: editorExperiment('contextual_formatting_toolbar', true) ? 1 : undefined
+            });
+          }
         }
       }
     },

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

@@ -63,7 +63,9 @@ export var buildToolbar = function buildToolbar(editorAnalyticsAPI) {
     var commentDisabledMessage = intl.formatMessage(fg('editor_inline_comments_on_inline_nodes') ? annotationMessages.createCommentDisabled : annotationMessages.createCommentInvalid);
     var createComment = {
       type: 'button',
-      showTitle: true,
+      showTitle: editorExperiment('contextual_formatting_toolbar', true, {
+        exposure: true
+      }) ? false : true,
       disabled: selectionValid === AnnotationSelectionType.DISABLED,
       testId: AnnotationTestIds.floatingToolbarCreateButton,
       icon: CommentIcon,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-annotation",
-	"version": "1.25.6",
+	"version": "1.26.0",
 	"description": "Annotation plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -32,7 +32,7 @@
 	},
 	"dependencies": {
 		"@atlaskit/adf-schema": "^46.1.0",
-		"@atlaskit/editor-common": "^96.0.0",
+		"@atlaskit/editor-common": "^96.1.0",
 		"@atlaskit/editor-plugin-analytics": "^1.10.0",
 		"@atlaskit/editor-plugin-editor-viewmode-effects": "^1.1.0",
 		"@atlaskit/editor-plugin-engagement-platform": "^2.1.0",