@atlaskit/editor-plugin-annotation 5.4.0 → 5.6.0

package/CHANGELOG.md

@@ -1,5 +1,24 @@
 # @atlaskit/editor-plugin-annotation
 
+## 5.6.0
+
+### Minor Changes
+
+- [`687c1b8fa7801`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/687c1b8fa7801) -
+  EDITOR-1566 bump adf-schema + update validator
+
+### Patch Changes
+
+- Updated dependencies
+
+## 5.5.0
+
+### Minor Changes
+
+- [`1f2b3dfa14308`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/1f2b3dfa14308) -
+  Clean up fg cc_comments_create_inline_experience_entry_point as true so that create comment
+  experience tracking logs always include the entryPoint
+
 ## 5.4.0
 
 ### Minor Changes

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

@@ -5,7 +5,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.shouldSuppressFloatingToolbar = exports.buildToolbar = exports.buildSuppressedToolbar = void 0;
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = _interopRequireDefault(require("react"));
 var _analytics = require("@atlaskit/editor-common/analytics");
 var _keymaps = require("@atlaskit/editor-common/keymaps");
@@ -17,8 +16,6 @@ var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _editorCommands = require("../editor-commands");
 var _types = require("../types");
 var _utils2 = require("./utils");
-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 getValidNodes = function getValidNodes(state) {
   var schema = state.schema;
   var annotation = schema.marks.annotation;
@@ -149,12 +146,11 @@ var buildToolbar = exports.buildToolbar = function buildToolbar(editorAnalyticsA
           annotationManager.checkPreemptiveGate().then(function (canStartDraft) {
             if (canStartDraft) {
               createCommentExperience === null || createCommentExperience === void 0 || createCommentExperience.start({
-                attributes: _objectSpread({
+                attributes: {
                   pageClass: 'editor',
-                  commentType: 'inline'
-                }, (0, _platformFeatureFlags.fg)('cc_comments_create_inline_experience_entry_point') ? {
+                  commentType: 'inline',
                   entryPoint: 'highlightActions'
-                } : {})
+                }
               });
               createCommentExperience === null || createCommentExperience === void 0 || createCommentExperience.initExperience.start();
               var result = annotationManager.startDraft();
@@ -186,12 +182,11 @@ var buildToolbar = exports.buildToolbar = function buildToolbar(editorAnalyticsA
           return true;
         } else {
           createCommentExperience === null || createCommentExperience === void 0 || createCommentExperience.start({
-            attributes: _objectSpread({
+            attributes: {
               pageClass: 'editor',
-              commentType: 'inline'
-            }, (0, _platformFeatureFlags.fg)('cc_comments_create_inline_experience_entry_point') ? {
+              commentType: 'inline',
               entryPoint: 'highlightActions'
-            } : {})
+            }
           });
           createCommentExperience === null || createCommentExperience === void 0 || createCommentExperience.initExperience.start();
           return (0, _editorCommands.setInlineCommentDraftState)(editorAnalyticsAPI)(true)(state, dispatch);

package/dist/cjs/ui/CommentButton/utils.js

@@ -1,20 +1,15 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.startCommentExperience = exports.shouldShowCommentButton = exports.isButtonDisabled = exports.fireOnClickAnalyticsEvent = exports.fireCommentButtonViewedAnalyticsEvent = void 0;
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _analytics = require("@atlaskit/editor-common/analytics");
 var _mediaSingle = require("@atlaskit/editor-common/media-single");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _editorCommands = require("../../editor-commands");
 var _utils = require("../../pm-plugins/utils");
 var _types = require("../../types");
-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 isButtonDisabled = exports.isButtonDisabled = function isButtonDisabled(_ref) {
   var _api$connectivity;
   var state = _ref.state,
@@ -97,12 +92,11 @@ var startCommentExperience = exports.startCommentExperience = function startComm
       if (canStartDraft) {
         var _annotationProviders$, _annotationProviders$2;
         (_annotationProviders$ = annotationProviders.createCommentExperience) === null || _annotationProviders$ === void 0 || _annotationProviders$.start({
-          attributes: _objectSpread({
+          attributes: {
             pageClass: 'editor',
-            commentType: 'inline'
-          }, (0, _platformFeatureFlags.fg)('cc_comments_create_inline_experience_entry_point') ? {
+            commentType: 'inline',
             entryPoint: 'highlightActions'
-          } : {})
+          }
         });
         (_annotationProviders$2 = annotationProviders.createCommentExperience) === null || _annotationProviders$2 === void 0 || _annotationProviders$2.initExperience.start();
         var result = annotationManager.startDraft();
@@ -125,12 +119,11 @@ var startCommentExperience = exports.startCommentExperience = function startComm
   } else {
     var _annotationProviders$3, _annotationProviders$4, _api$analytics4;
     annotationProviders === null || annotationProviders === void 0 || (_annotationProviders$3 = annotationProviders.createCommentExperience) === null || _annotationProviders$3 === void 0 || _annotationProviders$3.start({
-      attributes: _objectSpread({
+      attributes: {
         pageClass: 'editor',
-        commentType: 'inline'
-      }, (0, _platformFeatureFlags.fg)('cc_comments_create_inline_experience_entry_point') ? {
+        commentType: 'inline',
         entryPoint: 'highlightActions'
-      } : {})
+      }
     });
     annotationProviders === null || annotationProviders === void 0 || (_annotationProviders$4 = annotationProviders.createCommentExperience) === null || _annotationProviders$4 === void 0 || _annotationProviders$4.initExperience.start();
     return (0, _editorCommands.setInlineCommentDraftState)(api === null || api === void 0 || (_api$analytics4 = api.analytics) === null || _api$analytics4 === void 0 ? void 0 : _api$analytics4.actions, undefined, api)(true)(state, dispatch);

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

@@ -142,9 +142,7 @@ export const buildToolbar = editorAnalyticsAPI => ({
               attributes: {
                 pageClass: 'editor',
                 commentType: 'inline',
-                ...(fg('cc_comments_create_inline_experience_entry_point') ? {
-                  entryPoint: 'highlightActions'
-                } : {})
+                entryPoint: 'highlightActions'
               }
             });
             createCommentExperience === null || createCommentExperience === void 0 ? void 0 : createCommentExperience.initExperience.start();
@@ -180,9 +178,7 @@ export const buildToolbar = editorAnalyticsAPI => ({
           attributes: {
             pageClass: 'editor',
             commentType: 'inline',
-            ...(fg('cc_comments_create_inline_experience_entry_point') ? {
-              entryPoint: 'highlightActions'
-            } : {})
+            entryPoint: 'highlightActions'
           }
         });
         createCommentExperience === null || createCommentExperience === void 0 ? void 0 : createCommentExperience.initExperience.start();

package/dist/es2019/ui/CommentButton/utils.js

@@ -1,6 +1,5 @@
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD, MODE } from '@atlaskit/editor-common/analytics';
 import { currentMediaNodeWithPos } from '@atlaskit/editor-common/media-single';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { setInlineCommentDraftState } from '../../editor-commands';
 import { inlineCommentPluginKey, isSelectionValid } from '../../pm-plugins/utils';
@@ -96,9 +95,7 @@ export const startCommentExperience = ({
           attributes: {
             pageClass: 'editor',
             commentType: 'inline',
-            ...(fg('cc_comments_create_inline_experience_entry_point') ? {
-              entryPoint: 'highlightActions'
-            } : {})
+            entryPoint: 'highlightActions'
           }
         });
         (_annotationProviders$2 = annotationProviders.createCommentExperience) === null || _annotationProviders$2 === void 0 ? void 0 : _annotationProviders$2.initExperience.start();
@@ -125,9 +122,7 @@ export const startCommentExperience = ({
       attributes: {
         pageClass: 'editor',
         commentType: 'inline',
-        ...(fg('cc_comments_create_inline_experience_entry_point') ? {
-          entryPoint: 'highlightActions'
-        } : {})
+        entryPoint: 'highlightActions'
       }
     });
     annotationProviders === null || annotationProviders === void 0 ? void 0 : (_annotationProviders$4 = annotationProviders.createCommentExperience) === null || _annotationProviders$4 === void 0 ? void 0 : _annotationProviders$4.initExperience.start();

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

@@ -1,6 +1,3 @@
-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 { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD, MODE } from '@atlaskit/editor-common/analytics';
 import { ToolTipContent, addInlineComment } from '@atlaskit/editor-common/keymaps';
@@ -142,12 +139,11 @@ export var buildToolbar = function buildToolbar(editorAnalyticsAPI) {
           annotationManager.checkPreemptiveGate().then(function (canStartDraft) {
             if (canStartDraft) {
               createCommentExperience === null || createCommentExperience === void 0 || createCommentExperience.start({
-                attributes: _objectSpread({
+                attributes: {
                   pageClass: 'editor',
-                  commentType: 'inline'
-                }, fg('cc_comments_create_inline_experience_entry_point') ? {
+                  commentType: 'inline',
                   entryPoint: 'highlightActions'
-                } : {})
+                }
               });
               createCommentExperience === null || createCommentExperience === void 0 || createCommentExperience.initExperience.start();
               var result = annotationManager.startDraft();
@@ -179,12 +175,11 @@ export var buildToolbar = function buildToolbar(editorAnalyticsAPI) {
           return true;
         } else {
           createCommentExperience === null || createCommentExperience === void 0 || createCommentExperience.start({
-            attributes: _objectSpread({
+            attributes: {
               pageClass: 'editor',
-              commentType: 'inline'
-            }, fg('cc_comments_create_inline_experience_entry_point') ? {
+              commentType: 'inline',
               entryPoint: 'highlightActions'
-            } : {})
+            }
           });
           createCommentExperience === null || createCommentExperience === void 0 || createCommentExperience.initExperience.start();
           return setInlineCommentDraftState(editorAnalyticsAPI)(true)(state, dispatch);

package/dist/esm/ui/CommentButton/utils.js

@@ -1,9 +1,5 @@
-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 { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD, MODE } from '@atlaskit/editor-common/analytics';
 import { currentMediaNodeWithPos } from '@atlaskit/editor-common/media-single';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { setInlineCommentDraftState } from '../../editor-commands';
 import { inlineCommentPluginKey, isSelectionValid } from '../../pm-plugins/utils';
@@ -90,12 +86,11 @@ export var startCommentExperience = function startCommentExperience(_ref6) {
       if (canStartDraft) {
         var _annotationProviders$, _annotationProviders$2;
         (_annotationProviders$ = annotationProviders.createCommentExperience) === null || _annotationProviders$ === void 0 || _annotationProviders$.start({
-          attributes: _objectSpread({
+          attributes: {
             pageClass: 'editor',
-            commentType: 'inline'
-          }, fg('cc_comments_create_inline_experience_entry_point') ? {
+            commentType: 'inline',
             entryPoint: 'highlightActions'
-          } : {})
+          }
         });
         (_annotationProviders$2 = annotationProviders.createCommentExperience) === null || _annotationProviders$2 === void 0 || _annotationProviders$2.initExperience.start();
         var result = annotationManager.startDraft();
@@ -118,12 +113,11 @@ export var startCommentExperience = function startCommentExperience(_ref6) {
   } else {
     var _annotationProviders$3, _annotationProviders$4, _api$analytics4;
     annotationProviders === null || annotationProviders === void 0 || (_annotationProviders$3 = annotationProviders.createCommentExperience) === null || _annotationProviders$3 === void 0 || _annotationProviders$3.start({
-      attributes: _objectSpread({
+      attributes: {
         pageClass: 'editor',
-        commentType: 'inline'
-      }, fg('cc_comments_create_inline_experience_entry_point') ? {
+        commentType: 'inline',
         entryPoint: 'highlightActions'
-      } : {})
+      }
     });
     annotationProviders === null || annotationProviders === void 0 || (_annotationProviders$4 = annotationProviders.createCommentExperience) === null || _annotationProviders$4 === void 0 || _annotationProviders$4.initExperience.start();
     return setInlineCommentDraftState(api === null || api === void 0 || (_api$analytics4 = api.analytics) === null || _api$analytics4 === void 0 ? void 0 : _api$analytics4.actions, undefined, api)(true)(state, dispatch);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-annotation",
-	"version": "5.4.0",
+	"version": "5.6.0",
 	"description": "Annotation plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -27,9 +27,9 @@
 	"sideEffects": false,
 	"atlaskit:src": "src/index.ts",
 	"dependencies": {
-		"@atlaskit/adf-schema": "^51.1.2",
+		"@atlaskit/adf-schema": "^51.2.0",
 		"@atlaskit/analytics-next": "^11.1.0",
-		"@atlaskit/editor-plugin-analytics": "^5.2.0",
+		"@atlaskit/editor-plugin-analytics": "^5.3.0",
 		"@atlaskit/editor-plugin-connectivity": "^5.0.0",
 		"@atlaskit/editor-plugin-editor-viewmode-effects": "^5.0.0",
 		"@atlaskit/editor-plugin-feature-flags": "^4.0.0",
@@ -38,15 +38,15 @@
 		"@atlaskit/editor-prosemirror": "7.0.0",
 		"@atlaskit/editor-toolbar": "^0.9.0",
 		"@atlaskit/editor-toolbar-model": "^0.2.0",
-		"@atlaskit/icon": "^28.2.0",
+		"@atlaskit/icon": "^28.3.0",
 		"@atlaskit/onboarding": "^14.4.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
-		"@atlaskit/tmp-editor-statsig": "^12.27.0",
+		"@atlaskit/tmp-editor-statsig": "^12.30.0",
 		"@babel/runtime": "^7.0.0",
 		"react-intl-next": "npm:react-intl@^5.18.1"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^109.11.0",
+		"@atlaskit/editor-common": "^109.16.0",
 		"react": "^18.2.0",
 		"react-dom": "^18.2.0"
 	},
@@ -108,9 +108,6 @@
 		},
 		"confluence_frontend_preload_inline_comment_editor": {
 			"type": "boolean"
-		},
-		"cc_comments_create_inline_experience_entry_point": {
-			"type": "boolean"
 		}
 	}
 }