@atlaskit/editor-plugin-annotation 3.3.7 → 3.3.9

package/CHANGELOG.md

@@ -1,5 +1,24 @@
 # @atlaskit/editor-plugin-annotation
 
+## 3.3.9
+
+### Patch Changes
+
+- Updated dependencies
+
+## 3.3.8
+
+### Patch Changes
+
+- [`286abb4d35eba`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/286abb4d35eba) -
+  [ux] [ED-28960] Finish full page primary toolbar migration
+
+  - Align with design update (separator, gap, height, icon size)
+  - Add keyboard shortcut to focus toolbar and arrow key navigation
+  - Address accessibility
+
+- Updated dependencies
+
 ## 3.3.7
 
 ### Patch Changes

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

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.shouldSuppressFloatingToolbar = exports.getValidNodes = exports.buildToolbar = exports.buildSuppressedToolbar = void 0;
+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");
@@ -19,7 +19,7 @@ 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 = exports.getValidNodes = function getValidNodes(state) {
+var getValidNodes = function getValidNodes(state) {
   var schema = state.schema;
   var annotation = schema.marks.annotation;
   return Object.keys(schema.nodes).reduce(function (acc, current) {

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

@@ -10,7 +10,7 @@ exports.getPluginState = exports.getDraftCommandAnalyticsPayload = exports.getAn
 exports.getSelectionPositions = getSelectionPositions;
 exports.hasInvalidNodes = exports.hasAnyUnResolvedAnnotationInPage = void 0;
 exports.hasInvalidWhitespaceNode = hasInvalidWhitespaceNode;
-exports.isCurrentBlockNodeSelected = exports.isBlockNodeAnnotationsSelected = exports.inlineCommentPluginKey = void 0;
+exports.isBlockNodeAnnotationsSelected = exports.inlineCommentPluginKey = void 0;
 exports.isSelectedAnnotationsChanged = isSelectedAnnotationsChanged;
 exports.resolveDraftBookmark = exports.isSupportedBlockNode = exports.isSelectionValid = void 0;
 exports.stripNonExistingAnnotations = stripNonExistingAnnotations;
@@ -145,18 +145,6 @@ var getAnnotationViewKey = exports.getAnnotationViewKey = function getAnnotation
   }).join('_');
   return "view-annotation-wrapper_".concat(keys);
 };
-var isCurrentBlockNodeSelected = exports.isCurrentBlockNodeSelected = function isCurrentBlockNodeSelected(state, node) {
-  var selection = state.selection;
-  if (selection instanceof _state.NodeSelection) {
-    if (selection.node === node) {
-      return true;
-    }
-    if (node.type.name === 'media' && selection.node.firstChild === node) {
-      return true;
-    }
-  }
-  return false;
-};
 var findAnnotationsInSelection = exports.findAnnotationsInSelection = function findAnnotationsInSelection(selection, doc) {
   var empty = selection.empty,
     $anchor = selection.$anchor,

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

@@ -73,7 +73,8 @@ var CommentButton = exports.CommentButton = function CommentButton(_ref) {
     })
   }, /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarButton, {
     iconBefore: /*#__PURE__*/_react.default.createElement(_editorToolbar.CommentIcon, {
-      label: ""
+      label: "",
+      size: "small"
     }),
     onClick: onClick,
     testId: _types.AnnotationTestIds.floatingToolbarCreateButton,

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

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.startCommentExperience = exports.shouldShowCommentButton = exports.isButtonDisabled = exports.fireOnClickAnalyticsEvent = exports.fireCommentButtonViewedAnalyticsEvent = exports.fireAnnotationErrorAnalyticsEvent = void 0;
+exports.startCommentExperience = exports.shouldShowCommentButton = exports.isButtonDisabled = exports.fireOnClickAnalyticsEvent = exports.fireCommentButtonViewedAnalyticsEvent = void 0;
 var _analytics = require("@atlaskit/editor-common/analytics");
 var _mediaSingle = require("@atlaskit/editor-common/media-single");
 var _editorCommands = require("../../editor-commands");
@@ -42,7 +42,7 @@ var fireOnClickAnalyticsEvent = exports.fireOnClickAnalyticsEvent = function fir
     }
   });
 };
-var fireAnnotationErrorAnalyticsEvent = exports.fireAnnotationErrorAnalyticsEvent = function fireAnnotationErrorAnalyticsEvent(_ref4) {
+var fireAnnotationErrorAnalyticsEvent = function fireAnnotationErrorAnalyticsEvent(_ref4) {
   var _api$analytics2;
   var api = _ref4.api,
     errorReason = _ref4.errorReason;

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

@@ -9,7 +9,7 @@ import { fg } from '@atlaskit/platform-feature-flags';
 import { setInlineCommentDraftState } from '../editor-commands';
 import { AnnotationSelectionType, AnnotationTestIds } from '../types';
 import { getPluginState, isSelectionValid, resolveDraftBookmark } from './utils';
-export const getValidNodes = state => {
+const getValidNodes = state => {
   const {
     schema
   } = state;

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

@@ -113,20 +113,6 @@ export const getAnnotationViewKey = annotations => {
   const keys = annotations.map(mark => mark.id).join('_');
   return `view-annotation-wrapper_${keys}`;
 };
-export const isCurrentBlockNodeSelected = (state, node) => {
-  const {
-    selection
-  } = state;
-  if (selection instanceof NodeSelection) {
-    if (selection.node === node) {
-      return true;
-    }
-    if (node.type.name === 'media' && selection.node.firstChild === node) {
-      return true;
-    }
-  }
-  return false;
-};
 export const findAnnotationsInSelection = (selection, doc) => {
   const {
     empty,

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

@@ -69,7 +69,8 @@ export const CommentButton = ({
     })
   }, /*#__PURE__*/React.createElement(ToolbarButton, {
     iconBefore: /*#__PURE__*/React.createElement(NewCommentIcon, {
-      label: ""
+      label: "",
+      size: "small"
     }),
     onClick: onClick,
     testId: AnnotationTestIds.floatingToolbarCreateButton,

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

@@ -39,7 +39,7 @@ export const fireOnClickAnalyticsEvent = ({
     }
   });
 };
-export const fireAnnotationErrorAnalyticsEvent = ({
+const fireAnnotationErrorAnalyticsEvent = ({
   api,
   errorReason
 }) => {

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

@@ -12,7 +12,7 @@ import { fg } from '@atlaskit/platform-feature-flags';
 import { setInlineCommentDraftState } from '../editor-commands';
 import { AnnotationSelectionType, AnnotationTestIds } from '../types';
 import { getPluginState, isSelectionValid, resolveDraftBookmark } from './utils';
-export var getValidNodes = function getValidNodes(state) {
+var getValidNodes = function getValidNodes(state) {
   var schema = state.schema;
   var annotation = schema.marks.annotation;
   return Object.keys(schema.nodes).reduce(function (acc, current) {

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

@@ -128,18 +128,6 @@ export var getAnnotationViewKey = function getAnnotationViewKey(annotations) {
   }).join('_');
   return "view-annotation-wrapper_".concat(keys);
 };
-export var isCurrentBlockNodeSelected = function isCurrentBlockNodeSelected(state, node) {
-  var selection = state.selection;
-  if (selection instanceof NodeSelection) {
-    if (selection.node === node) {
-      return true;
-    }
-    if (node.type.name === 'media' && selection.node.firstChild === node) {
-      return true;
-    }
-  }
-  return false;
-};
 export var findAnnotationsInSelection = function findAnnotationsInSelection(selection, doc) {
   var empty = selection.empty,
     $anchor = selection.$anchor,

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

@@ -66,7 +66,8 @@ export var CommentButton = function CommentButton(_ref) {
     })
   }, /*#__PURE__*/React.createElement(ToolbarButton, {
     iconBefore: /*#__PURE__*/React.createElement(NewCommentIcon, {
-      label: ""
+      label: "",
+      size: "small"
     }),
     onClick: onClick,
     testId: AnnotationTestIds.floatingToolbarCreateButton,

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

@@ -36,7 +36,7 @@ export var fireOnClickAnalyticsEvent = function fireOnClickAnalyticsEvent(_ref3)
     }
   });
 };
-export var fireAnnotationErrorAnalyticsEvent = function fireAnnotationErrorAnalyticsEvent(_ref4) {
+var fireAnnotationErrorAnalyticsEvent = function fireAnnotationErrorAnalyticsEvent(_ref4) {
   var _api$analytics2;
   var api = _ref4.api,
     errorReason = _ref4.errorReason;

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

@@ -20,7 +20,6 @@ interface BuildToolbarOptions {
     getCanAddComments?: () => boolean;
     contentType?: string;
 }
-export declare const getValidNodes: (state: EditorState) => NodeType[];
 type ShouldSuppressFloatingToolbarOptions = {
     state: EditorState;
     bookmark?: SelectionBookmark;

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

@@ -18,7 +18,6 @@ export declare const decorationKey: {
 };
 export declare const addDraftDecoration: (start: number, end: number, targetType?: TargetType) => Decoration;
 export declare const getAnnotationViewKey: (annotations: AnnotationInfo[]) => string;
-export declare const isCurrentBlockNodeSelected: (state: EditorState, node: Node) => boolean;
 export declare const findAnnotationsInSelection: (selection: Selection, doc: Node) => AnnotationInfo[];
 export declare const resolveDraftBookmark: (editorState: EditorState, bookmark?: SelectionBookmark, supportedBlockNodes?: string[]) => DraftBookmark;
 /**

package/dist/types/ui/AnnotationViewWrapper.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-export type AnnotationViewWrapperProps = {
+type AnnotationViewWrapperProps = {
     children: React.ReactNode;
     onViewed?: () => void;
     annotationText?: string;
@@ -8,3 +8,4 @@ export declare class AnnotationViewWrapper extends React.PureComponent<Annotatio
     componentDidMount(): void;
     render(): React.ReactNode;
 }
+export {};

package/dist/types/ui/CommentButton/utils.d.ts

@@ -15,10 +15,6 @@ export declare const shouldShowCommentButton: ({ state, isVisible, annotationSel
 export declare const fireOnClickAnalyticsEvent: ({ api, }: {
     api: ExtractInjectionAPI<AnnotationPlugin>;
 }) => void;
-export declare const fireAnnotationErrorAnalyticsEvent: ({ api, errorReason, }: {
-    api: ExtractInjectionAPI<AnnotationPlugin>;
-    errorReason: string;
-}) => void;
 export declare const fireCommentButtonViewedAnalyticsEvent: ({ api, isNonTextInlineNodeInludedInComment, annotationSelectionType, }: {
     api?: ExtractInjectionAPI<AnnotationPlugin>;
     isNonTextInlineNodeInludedInComment: boolean;

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

@@ -20,7 +20,6 @@ interface BuildToolbarOptions {
     getCanAddComments?: () => boolean;
     contentType?: string;
 }
-export declare const getValidNodes: (state: EditorState) => NodeType[];
 type ShouldSuppressFloatingToolbarOptions = {
     state: EditorState;
     bookmark?: SelectionBookmark;

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

@@ -18,7 +18,6 @@ export declare const decorationKey: {
 };
 export declare const addDraftDecoration: (start: number, end: number, targetType?: TargetType) => Decoration;
 export declare const getAnnotationViewKey: (annotations: AnnotationInfo[]) => string;
-export declare const isCurrentBlockNodeSelected: (state: EditorState, node: Node) => boolean;
 export declare const findAnnotationsInSelection: (selection: Selection, doc: Node) => AnnotationInfo[];
 export declare const resolveDraftBookmark: (editorState: EditorState, bookmark?: SelectionBookmark, supportedBlockNodes?: string[]) => DraftBookmark;
 /**

package/dist/types-ts4.5/ui/AnnotationViewWrapper.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-export type AnnotationViewWrapperProps = {
+type AnnotationViewWrapperProps = {
     children: React.ReactNode;
     onViewed?: () => void;
     annotationText?: string;
@@ -8,3 +8,4 @@ export declare class AnnotationViewWrapper extends React.PureComponent<Annotatio
     componentDidMount(): void;
     render(): React.ReactNode;
 }
+export {};

package/dist/types-ts4.5/ui/CommentButton/utils.d.ts

@@ -15,10 +15,6 @@ export declare const shouldShowCommentButton: ({ state, isVisible, annotationSel
 export declare const fireOnClickAnalyticsEvent: ({ api, }: {
     api: ExtractInjectionAPI<AnnotationPlugin>;
 }) => void;
-export declare const fireAnnotationErrorAnalyticsEvent: ({ api, errorReason, }: {
-    api: ExtractInjectionAPI<AnnotationPlugin>;
-    errorReason: string;
-}) => void;
 export declare const fireCommentButtonViewedAnalyticsEvent: ({ api, isNonTextInlineNodeInludedInComment, annotationSelectionType, }: {
     api?: ExtractInjectionAPI<AnnotationPlugin>;
     isNonTextInlineNodeInludedInComment: boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-annotation",
-	"version": "3.3.7",
+	"version": "3.3.9",
 	"description": "Annotation plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -36,19 +36,19 @@
 		"@atlaskit/editor-plugin-connectivity": "^3.1.0",
 		"@atlaskit/editor-plugin-editor-viewmode-effects": "^3.0.0",
 		"@atlaskit/editor-plugin-feature-flags": "^2.0.0",
-		"@atlaskit/editor-plugin-toolbar": "^0.3.0",
+		"@atlaskit/editor-plugin-toolbar": "^0.4.0",
 		"@atlaskit/editor-prosemirror": "7.0.0",
 		"@atlaskit/editor-toolbar": "^0.3.0",
 		"@atlaskit/editor-toolbar-model": "^0.1.0",
 		"@atlaskit/icon": "^28.0.0",
 		"@atlaskit/onboarding": "^14.3.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
-		"@atlaskit/tmp-editor-statsig": "^11.3.0",
+		"@atlaskit/tmp-editor-statsig": "^11.5.0",
 		"@babel/runtime": "^7.0.0",
 		"react-intl-next": "npm:react-intl@^5.18.1"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^107.26.0",
+		"@atlaskit/editor-common": "^107.28.0",
 		"react": "^18.2.0",
 		"react-dom": "^18.2.0"
 	},