@atlaskit/editor-plugin-annotation 1.25.7 → 1.26.1

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @atlaskit/editor-plugin-annotation
 
+## 1.26.1
+
+### Patch Changes
+
+- [#175552](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/175552)
+  [`b29361001f720`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/b29361001f720) -
+  refactor: remediate re-exports in editor-plugin-ai-definitions, editor-plugin-alignment,
+  editor-plugin-analytics, editor-plugin-annotation
+- Updated dependencies
+
+## 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

package/dist/cjs/annotationPlugin.js

@@ -4,17 +4,10 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-Object.defineProperty(exports, "AnnotationUpdateEmitter", {
-  enumerable: true,
-  get: function get() {
-    return _annotation.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");
@@ -98,9 +91,13 @@ var annotationPlugin = exports.annotationPlugin = function annotationPlugin(_ref
             isToolbarAbove: isToolbarAbove,
             api: api
           });
-          return _objectSpread(_objectSpread({}, toolbarConfig), {}, {
-            rank: (0, _experiments.editorExperiment)('contextual_formatting_toolbar', true) ? 1 : undefined
-          });
+          if (!toolbarConfig) {
+            return undefined;
+          } else {
+            return _objectSpread(_objectSpread({}, toolbarConfig), {}, {
+              rank: (0, _experiments.editorExperiment)('contextual_formatting_toolbar', true) ? 1 : undefined
+            });
+          }
         }
       }
     },

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

@@ -5,20 +5,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.addDraftDecoration = void 0;
 exports.annotationExists = annotationExists;
-Object.defineProperty(exports, "containsAnyAnnotations", {
-  enumerable: true,
-  get: function get() {
-    return _utils.containsAnyAnnotations;
-  }
-});
 exports.getPluginState = exports.getDraftCommandAnalyticsPayload = exports.getAnnotationViewKey = exports.getAllAnnotations = exports.findAnnotationsInSelection = exports.decorationKey = void 0;
 exports.getSelectionPositions = getSelectionPositions;
-Object.defineProperty(exports, "hasAnnotationMark", {
-  enumerable: true,
-  get: function get() {
-    return _utils.hasAnnotationMark;
-  }
-});
 exports.hasInvalidNodes = void 0;
 exports.hasInvalidWhitespaceNode = hasInvalidWhitespaceNode;
 exports.isCurrentBlockNodeSelected = exports.isBlockNodeAnnotationsSelected = exports.inlineCommentPluginKey = void 0;

package/dist/es2019/annotationPlugin.js

@@ -1,6 +1,5 @@
 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';
@@ -84,10 +83,14 @@ export const annotationPlugin = ({
             isToolbarAbove,
             api
           });
-          return {
-            ...toolbarConfig,
-            rank: editorExperiment('contextual_formatting_toolbar', true) ? 1 : undefined
-          };
+          if (!toolbarConfig) {
+            return undefined;
+          } else {
+            return {
+              ...toolbarConfig,
+              rank: editorExperiment('contextual_formatting_toolbar', true) ? 1 : undefined
+            };
+          }
         }
       }
     },
@@ -129,5 +132,4 @@ function AnnotationContentComponent({
     editorAnalyticsAPI: api === null || api === void 0 ? void 0 : (_api$analytics5 = api.analytics) === null || _api$analytics5 === void 0 ? void 0 : _api$analytics5.actions,
     editorAPI: api
   }));
-}
-export { AnnotationUpdateEmitter };
+}

package/dist/es2019/index.js

@@ -1 +1,4 @@
+// Disable no-re-export rule for entry point files
+/* eslint-disable @atlaskit/editor/no-re-export */
+
 export { annotationPlugin } from './annotationPlugin';

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

@@ -2,12 +2,11 @@ import { AnnotationTypes } from '@atlaskit/adf-schema';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
 import { currentMediaNodeWithPos } from '@atlaskit/editor-common/media-single';
 import { AnnotationSharedClassNames, BlockAnnotationSharedClassNames } from '@atlaskit/editor-common/styles';
-import { canApplyAnnotationOnRange, containsAnyAnnotations, getAnnotationIdsFromRange, getRangeInlineNodeNames, hasAnnotationMark, isEmptyTextSelection, isParagraph, isText } from '@atlaskit/editor-common/utils';
+import { canApplyAnnotationOnRange, getAnnotationIdsFromRange, getRangeInlineNodeNames, hasAnnotationMark, isEmptyTextSelection, isParagraph, isText } from '@atlaskit/editor-common/utils';
 import { AllSelection, NodeSelection, PluginKey, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { Decoration } from '@atlaskit/editor-prosemirror/view';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { AnnotationSelectionType } from '../types';
-export { hasAnnotationMark, containsAnyAnnotations };
 function sum(arr, f) {
   return arr.reduce((val, x) => val + f(x), 0);
 }

package/dist/esm/annotationPlugin.js

@@ -3,7 +3,6 @@ function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbol
 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';
@@ -85,9 +84,13 @@ export var annotationPlugin = function annotationPlugin(_ref) {
             isToolbarAbove: isToolbarAbove,
             api: api
           });
-          return _objectSpread(_objectSpread({}, toolbarConfig), {}, {
-            rank: editorExperiment('contextual_formatting_toolbar', true) ? 1 : undefined
-          });
+          if (!toolbarConfig) {
+            return undefined;
+          } else {
+            return _objectSpread(_objectSpread({}, toolbarConfig), {}, {
+              rank: editorExperiment('contextual_formatting_toolbar', true) ? 1 : undefined
+            });
+          }
         }
       }
     },
@@ -126,5 +129,4 @@ function AnnotationContentComponent(_ref4) {
     editorAnalyticsAPI: api === null || api === void 0 || (_api$analytics5 = api.analytics) === null || _api$analytics5 === void 0 ? void 0 : _api$analytics5.actions,
     editorAPI: api
   }));
-}
-export { AnnotationUpdateEmitter };
+}

package/dist/esm/index.js

@@ -1 +1,4 @@
+// Disable no-re-export rule for entry point files
+/* eslint-disable @atlaskit/editor/no-re-export */
+
 export { annotationPlugin } from './annotationPlugin';

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

@@ -2,12 +2,11 @@ import { AnnotationTypes } from '@atlaskit/adf-schema';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
 import { currentMediaNodeWithPos } from '@atlaskit/editor-common/media-single';
 import { AnnotationSharedClassNames, BlockAnnotationSharedClassNames } from '@atlaskit/editor-common/styles';
-import { canApplyAnnotationOnRange, containsAnyAnnotations, getAnnotationIdsFromRange, getRangeInlineNodeNames, hasAnnotationMark, isEmptyTextSelection, isParagraph, isText } from '@atlaskit/editor-common/utils';
+import { canApplyAnnotationOnRange, getAnnotationIdsFromRange, getRangeInlineNodeNames, hasAnnotationMark, isEmptyTextSelection, isParagraph, isText } from '@atlaskit/editor-common/utils';
 import { AllSelection, NodeSelection, PluginKey, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { Decoration } from '@atlaskit/editor-prosemirror/view';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { AnnotationSelectionType } from '../types';
-export { hasAnnotationMark, containsAnyAnnotations };
 function sum(arr, f) {
   return arr.reduce(function (val, x) {
     return val + f(x);

package/dist/types/annotationPlugin.d.ts

@@ -1,7 +1,2 @@
-import type { UpdateEvent } from '@atlaskit/editor-common/annotation';
-import { AnnotationUpdateEmitter } from '@atlaskit/editor-common/annotation';
 import type { AnnotationPlugin } from './annotationPluginType';
-import type { AnnotationInfo, AnnotationProviders, AnnotationState, AnnotationTypeProvider, InlineCommentAnnotationProvider, InlineCommentCreateComponentProps, InlineCommentState, InlineCommentViewComponentProps } from './types';
 export declare const annotationPlugin: AnnotationPlugin;
-export { AnnotationUpdateEmitter };
-export type { AnnotationProviders, InlineCommentAnnotationProvider, InlineCommentCreateComponentProps, InlineCommentViewComponentProps, AnnotationTypeProvider, AnnotationInfo, AnnotationState, InlineCommentState, UpdateEvent, };

package/dist/types/pm-plugins/utils.d.ts

@@ -1,5 +1,4 @@
 import type { AnalyticsEventPayloadCallback } from '@atlaskit/editor-common/analytics';
-import { containsAnyAnnotations, hasAnnotationMark } from '@atlaskit/editor-common/utils';
 import type { Mark, Node, ResolvedPos, Schema, Slice } from '@atlaskit/editor-prosemirror/model';
 import type { EditorState, Selection, SelectionBookmark } from '@atlaskit/editor-prosemirror/state';
 import { AllSelection, NodeSelection, PluginKey, TextSelection } from '@atlaskit/editor-prosemirror/state';
@@ -7,7 +6,6 @@ import { Decoration } from '@atlaskit/editor-prosemirror/view';
 import type { AnnotationInfo, DraftBookmark, InlineCommentInputMethod, TargetType } from '../types';
 import { AnnotationSelectionType } from '../types';
 import type { InlineCommentPluginState } from './types';
-export { hasAnnotationMark, containsAnyAnnotations };
 /**
  * Finds the marks in the nodes to the left and right.
  * @param $pos Position to center search around

package/dist/types-ts4.5/annotationPlugin.d.ts

@@ -1,7 +1,2 @@
-import type { UpdateEvent } from '@atlaskit/editor-common/annotation';
-import { AnnotationUpdateEmitter } from '@atlaskit/editor-common/annotation';
 import type { AnnotationPlugin } from './annotationPluginType';
-import type { AnnotationInfo, AnnotationProviders, AnnotationState, AnnotationTypeProvider, InlineCommentAnnotationProvider, InlineCommentCreateComponentProps, InlineCommentState, InlineCommentViewComponentProps } from './types';
 export declare const annotationPlugin: AnnotationPlugin;
-export { AnnotationUpdateEmitter };
-export type { AnnotationProviders, InlineCommentAnnotationProvider, InlineCommentCreateComponentProps, InlineCommentViewComponentProps, AnnotationTypeProvider, AnnotationInfo, AnnotationState, InlineCommentState, UpdateEvent, };

package/dist/types-ts4.5/pm-plugins/utils.d.ts

@@ -1,5 +1,4 @@
 import type { AnalyticsEventPayloadCallback } from '@atlaskit/editor-common/analytics';
-import { containsAnyAnnotations, hasAnnotationMark } from '@atlaskit/editor-common/utils';
 import type { Mark, Node, ResolvedPos, Schema, Slice } from '@atlaskit/editor-prosemirror/model';
 import type { EditorState, Selection, SelectionBookmark } from '@atlaskit/editor-prosemirror/state';
 import { AllSelection, NodeSelection, PluginKey, TextSelection } from '@atlaskit/editor-prosemirror/state';
@@ -7,7 +6,6 @@ import { Decoration } from '@atlaskit/editor-prosemirror/view';
 import type { AnnotationInfo, DraftBookmark, InlineCommentInputMethod, TargetType } from '../types';
 import { AnnotationSelectionType } from '../types';
 import type { InlineCommentPluginState } from './types';
-export { hasAnnotationMark, containsAnyAnnotations };
 /**
  * Finds the marks in the nodes to the left and right.
  * @param $pos Position to center search around

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-annotation",
-	"version": "1.25.7",
+	"version": "1.26.1",
 	"description": "Annotation plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -32,16 +32,16 @@
 	},
 	"dependencies": {
 		"@atlaskit/adf-schema": "^46.1.0",
-		"@atlaskit/editor-common": "^96.1.0",
+		"@atlaskit/editor-common": "^96.3.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",
 		"@atlaskit/editor-plugin-feature-flags": "^1.2.0",
 		"@atlaskit/editor-prosemirror": "6.2.1",
-		"@atlaskit/icon": "^23.0.0",
+		"@atlaskit/icon": "^23.1.0",
 		"@atlaskit/onboarding": "^12.1.0",
 		"@atlaskit/platform-feature-flags": "^0.3.0",
-		"@atlaskit/tmp-editor-statsig": "^2.22.0",
+		"@atlaskit/tmp-editor-statsig": "^2.23.0",
 		"@babel/runtime": "^7.0.0"
 	},
 	"peerDependencies": {