@atlaskit/editor-plugin-annotation 15.0.13 → 15.0.14

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # @atlaskit/editor-plugin-annotation
 
+## 15.0.14
+
+### Patch Changes
+
+- [`656801b9e097c`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/656801b9e097c) -
+  VOLTC-331 - Migrate updated package usage in platform/editor: rewrite barrel imports of
+  voltCompliant provider packages to deep/subpath imports (consumer-side debarrel). No public API
+  changes.
+- Updated dependencies
+
 ## 15.0.13
 
 ### Patch Changes

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

@@ -10,7 +10,7 @@ var _mark = require("@atlaskit/editor-common/mark");
 var _utils = require("@atlaskit/editor-common/utils");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _transform = require("@atlaskit/editor-prosemirror/transform");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
+var _fg = require("@atlaskit/platform-feature-flags/fg");
 var _utils2 = require("../pm-plugins/utils");
 var isAnnotationStep = function isAnnotationStep(step) {
   return step instanceof _transform.AddMarkStep && step.mark.type.name === 'annotation';
@@ -103,7 +103,7 @@ var addInsertAnalytics = function addInsertAnalytics(editorAnalyticsAPI) {
       actionSubjectId: _analytics.ACTION_SUBJECT_ID.INLINE_COMMENT,
       attributes: {}
     };
-    if ((0, _platformFeatureFlags.fg)('editor_inline_comments_on_inline_nodes')) {
+    if ((0, _fg.fg)('editor_inline_comments_on_inline_nodes')) {
       var _ref2 = (0, _utils2.getPluginState)(state) || {},
         bookmark = _ref2.bookmark;
 

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

@@ -13,7 +13,7 @@ var _analytics = require("@atlaskit/editor-common/analytics");
 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 _fg = require("@atlaskit/platform-feature-flags/fg");
 var _editorCommands = require("../editor-commands");
 var _utils2 = require("../editor-commands/utils");
 var _nodeviews = require("../nodeviews");
@@ -72,7 +72,7 @@ var fetchState = /*#__PURE__*/function () {
             break;
           }
           _ref3 = (0, _utils3.getPluginState)(editorView.state) || {}, annotationsLoaded = _ref3.annotationsLoaded;
-          if (!annotationsLoaded && (0, _platformFeatureFlags.fg)('confluence_frontend_new_dangling_comments_ux')) {
+          if (!annotationsLoaded && (0, _fg.fg)('confluence_frontend_new_dangling_comments_ux')) {
             (0, _editorCommands.setInlineCommentsFetched)()(editorView.state, editorView.dispatch);
           }
           return _context2.abrupt("return");
@@ -492,7 +492,7 @@ var inlineCommentPlugin = exports.inlineCommentPlugin = function inlineCommentPl
                   key: _utils3.decorationKey.block
                 }));
               } else {
-                if ((0, _platformFeatureFlags.fg)('editor_inline_comments_on_inline_nodes')) {
+                if ((0, _fg.fg)('editor_inline_comments_on_inline_nodes')) {
                   if (node.isText) {
                     focusDecorations.push(_view.Decoration.inline(pos, pos + node.nodeSize, {
                       class: "".concat((0, _nodeviews.getAnnotationViewClassname)(isUnresolved, isSelected, isHovered), " ").concat(isUnresolved),

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

@@ -13,7 +13,7 @@ var _messages = require("@atlaskit/editor-common/messages");
 var _utils = require("@atlaskit/editor-common/utils");
 var _editorPluginConnectivity = require("@atlaskit/editor-plugin-connectivity");
 var _comment = _interopRequireDefault(require("@atlaskit/icon/core/comment"));
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
+var _fg = require("@atlaskit/platform-feature-flags/fg");
 var _editorCommands = require("../editor-commands");
 var _types = require("../types");
 var _utils2 = require("./utils");
@@ -82,7 +82,7 @@ var buildToolbar = exports.buildToolbar = function buildToolbar(editorAnalyticsA
       return undefined;
     }
     var createCommentMessage = intl.formatMessage(_messages.annotationMessages.createComment);
-    var commentDisabledMessage = intl.formatMessage((0, _platformFeatureFlags.fg)('editor_inline_comments_on_inline_nodes') ? _messages.annotationMessages.createCommentDisabled : _messages.annotationMessages.createCommentInvalid);
+    var commentDisabledMessage = intl.formatMessage((0, _fg.fg)('editor_inline_comments_on_inline_nodes') ? _messages.annotationMessages.createCommentDisabled : _messages.annotationMessages.createCommentInvalid);
     var canAddComments = getCanAddComments();
     var isCommentButtonDisabled = !canAddComments || selectionValid === _types.AnnotationSelectionType.DISABLED;
     var disabledTooltipContent = !canAddComments ? intl.formatMessage(_messages.annotationMessages.noPermissionToAddComment, {

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

@@ -23,7 +23,7 @@ var _styles = require("@atlaskit/editor-common/styles");
 var _utils = require("@atlaskit/editor-common/utils");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _view = require("@atlaskit/editor-prosemirror/view");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
+var _fg = require("@atlaskit/platform-feature-flags/fg");
 var _types = require("../types");
 function sum(arr, f) {
   return arr.reduce(function (val, x) {
@@ -151,7 +151,7 @@ var findAnnotationsInSelection = exports.findAnnotationsInSelection = function f
     anchor = selection.anchor;
   // Only detect annotations on caret selection
   if (!empty || !doc) {
-    if ((0, _platformFeatureFlags.fg)('editor_inline_comments_on_inline_nodes')) {
+    if ((0, _fg.fg)('editor_inline_comments_on_inline_nodes')) {
       if (selection instanceof _state.NodeSelection && ['inlineCard', 'emoji', 'date', 'mention', 'status'].includes(selection.node.type.name)) {
         // Inline comments on these nodes are supported -- so we continue to find annotations
       } else {
@@ -280,7 +280,7 @@ var getDraftCommandAnalyticsPayload = exports.getDraftCommandAnalyticsPayload =
         overlap: getAnnotationsInSelectionCount(state)
       };
     }
-    if ((0, _platformFeatureFlags.fg)('editor_inline_comments_on_inline_nodes')) {
+    if ((0, _fg.fg)('editor_inline_comments_on_inline_nodes')) {
       var _ref2 = getPluginState(state) || {},
         bookmark = _ref2.bookmark;
       attributes.inlineNodeNames = (0, _utils.getRangeInlineNodeNames)({
@@ -359,25 +359,25 @@ function hasInvalidWhitespaceNode(selection, schema) {
   var hasCommentableInlineNodeDescendants = false;
   var hasCommentableTextNodeDescendants = false;
   content.descendants(function (node) {
-    if ((0, _platformFeatureFlags.fg)('editor_inline_comments_on_inline_nodes')) {
+    if ((0, _fg.fg)('editor_inline_comments_on_inline_nodes')) {
       var isAllowedInlineNode = ['emoji', 'status', 'date', 'mention', 'inlineCard'].includes(node.type.name);
       if (isAllowedInlineNode) {
         hasCommentableInlineNodeDescendants = true;
         return false;
       }
     }
-    if (node.type === schema.nodes.inlineCard && (0, _platformFeatureFlags.fg)('editor_inline_comments_on_inline_nodes')) {
+    if (node.type === schema.nodes.inlineCard && (0, _fg.fg)('editor_inline_comments_on_inline_nodes')) {
       return false;
     }
     if ((0, _utils.isText)(node, schema)) {
-      if ((0, _platformFeatureFlags.fg)('editor_inline_comments_on_inline_nodes')) {
+      if ((0, _fg.fg)('editor_inline_comments_on_inline_nodes')) {
         if (node.textContent.trim() !== '') {
           hasCommentableTextNodeDescendants = true;
         }
       }
       return false;
     }
-    if (!(0, _platformFeatureFlags.fg)('editor_inline_comments_on_inline_nodes')) {
+    if (!(0, _fg.fg)('editor_inline_comments_on_inline_nodes')) {
       if (node.textContent.trim() === '') {
         // Trailing new lines do not result in the annotation spanning into
         // the trailing new line so can be ignored when looking for invalid
@@ -400,7 +400,7 @@ function hasInvalidWhitespaceNode(selection, schema) {
     }
     return !foundInvalidWhitespace;
   });
-  if ((0, _platformFeatureFlags.fg)('editor_inline_comments_on_inline_nodes')) {
+  if ((0, _fg.fg)('editor_inline_comments_on_inline_nodes')) {
     if (hasCommentableInlineNodeDescendants) {
       return false;
     }

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

@@ -12,7 +12,7 @@ var _keymaps = require("@atlaskit/editor-common/keymaps");
 var _messages = require("@atlaskit/editor-common/messages");
 var _toolbar = require("@atlaskit/editor-common/toolbar");
 var _editorToolbar = require("@atlaskit/editor-toolbar");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
+var _fg = require("@atlaskit/platform-feature-flags/fg");
 var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _utils = require("../../pm-plugins/utils");
 var _types = require("../../types");
@@ -68,7 +68,7 @@ var CommentButton = exports.CommentButton = function CommentButton(_ref) {
   }
   var canAddComments = getCanAddComments ? getCanAddComments() : true;
   var commentMessage = intl.formatMessage(_messages.annotationMessages.createComment);
-  var commentDisabledMessage = intl.formatMessage((0, _platformFeatureFlags.fg)('editor_inline_comments_on_inline_nodes') ? _messages.annotationMessages.createCommentDisabled : _messages.annotationMessages.createCommentInvalid);
+  var commentDisabledMessage = intl.formatMessage((0, _fg.fg)('editor_inline_comments_on_inline_nodes') ? _messages.annotationMessages.createCommentDisabled : _messages.annotationMessages.createCommentInvalid);
   var noPermissionToAddCommentMessage = intl.formatMessage(_messages.annotationMessages.noPermissionToAddComment, {
     contentType: contentType
   });

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

@@ -4,7 +4,7 @@ import { applyMarkOnRange } from '@atlaskit/editor-common/mark';
 import { getRangeInlineNodeNames } from '@atlaskit/editor-common/utils';
 import { NodeSelection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { AddMarkStep } from '@atlaskit/editor-prosemirror/transform';
-import { fg } from '@atlaskit/platform-feature-flags';
+import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { getDraftCommandAnalyticsPayload, getPluginState, resolveDraftBookmark } from '../pm-plugins/utils';
 const isAnnotationStep = step => step instanceof AddMarkStep && step.mark.type.name === 'annotation';
 const addAnnotationMark = (id, supportedBlockNodes) => (transaction, state) => {

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

@@ -3,7 +3,7 @@ import { RESOLVE_METHOD } from '@atlaskit/editor-common/analytics';
 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 { fg } from '@atlaskit/platform-feature-flags/fg';
 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';

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

@@ -6,7 +6,7 @@ import { annotationMessages } from '@atlaskit/editor-common/messages';
 import { calculateToolbarPositionAboveSelection, calculateToolbarPositionTrackHead, getRangeInlineNodeNames } from '@atlaskit/editor-common/utils';
 import { isOfflineMode } from '@atlaskit/editor-plugin-connectivity';
 import CommentIcon from '@atlaskit/icon/core/comment';
-import { fg } from '@atlaskit/platform-feature-flags';
+import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { setInlineCommentDraftState } from '../editor-commands';
 import { AnnotationSelectionType, AnnotationTestIds } from '../types';
 import { getPluginState, isSelectionValid, resolveDraftBookmark } from './utils';

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

@@ -5,7 +5,7 @@ import { AnnotationSharedClassNames, BlockAnnotationSharedClassNames } from '@at
 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 { fg } from '@atlaskit/platform-feature-flags/fg';
 import { AnnotationSelectionType } from '../types';
 function sum(arr, f) {
   return arr.reduce((val, x) => val + f(x), 0);

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

@@ -5,7 +5,7 @@ import { ToolTipContent, addInlineComment } from '@atlaskit/editor-common/keymap
 import { annotationMessages } from '@atlaskit/editor-common/messages';
 import { useEditorToolbar } from '@atlaskit/editor-common/toolbar';
 import { ToolbarButton, CommentIcon as NewCommentIcon, ToolbarTooltip } from '@atlaskit/editor-toolbar';
-import { fg } from '@atlaskit/platform-feature-flags';
+import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { isSelectionValid } from '../../pm-plugins/utils';
 import { AnnotationSelectionType, AnnotationTestIds } from '../../types';

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

@@ -4,7 +4,7 @@ import { applyMarkOnRange } from '@atlaskit/editor-common/mark';
 import { getRangeInlineNodeNames } from '@atlaskit/editor-common/utils';
 import { NodeSelection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { AddMarkStep } from '@atlaskit/editor-prosemirror/transform';
-import { fg } from '@atlaskit/platform-feature-flags';
+import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { getDraftCommandAnalyticsPayload, getPluginState, resolveDraftBookmark } from '../pm-plugins/utils';
 var isAnnotationStep = function isAnnotationStep(step) {
   return step instanceof AddMarkStep && step.mark.type.name === 'annotation';

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

@@ -6,7 +6,7 @@ import { RESOLVE_METHOD } from '@atlaskit/editor-common/analytics';
 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 { fg } from '@atlaskit/platform-feature-flags/fg';
 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';

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

@@ -6,7 +6,7 @@ import { annotationMessages } from '@atlaskit/editor-common/messages';
 import { calculateToolbarPositionAboveSelection, calculateToolbarPositionTrackHead, getRangeInlineNodeNames } from '@atlaskit/editor-common/utils';
 import { isOfflineMode } from '@atlaskit/editor-plugin-connectivity';
 import CommentIcon from '@atlaskit/icon/core/comment';
-import { fg } from '@atlaskit/platform-feature-flags';
+import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { setInlineCommentDraftState } from '../editor-commands';
 import { AnnotationSelectionType, AnnotationTestIds } from '../types';
 import { getPluginState, isSelectionValid, resolveDraftBookmark } from './utils';

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

@@ -6,7 +6,7 @@ import { AnnotationSharedClassNames, BlockAnnotationSharedClassNames } from '@at
 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 { fg } from '@atlaskit/platform-feature-flags/fg';
 import { AnnotationSelectionType } from '../types';
 function sum(arr, f) {
   return arr.reduce(function (val, x) {

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

@@ -5,7 +5,7 @@ import { ToolTipContent, addInlineComment } from '@atlaskit/editor-common/keymap
 import { annotationMessages } from '@atlaskit/editor-common/messages';
 import { useEditorToolbar } from '@atlaskit/editor-common/toolbar';
 import { ToolbarButton, CommentIcon as NewCommentIcon, ToolbarTooltip } from '@atlaskit/editor-toolbar';
-import { fg } from '@atlaskit/platform-feature-flags';
+import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { isSelectionValid } from '../../pm-plugins/utils';
 import { AnnotationSelectionType, AnnotationTestIds } from '../../types';

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

@@ -98,7 +98,6 @@ export type InlineCommentAction = {
     type: ACTIONS.SET_INLINE_COMMENTS_FETCHED;
 };
 export type InlineCommentPluginState = {
-    annotationsLoaded: boolean;
     /**
      * The resolved state of the annotations.
      *
@@ -120,6 +119,7 @@ export type InlineCommentPluginState = {
      * ```
      */
     annotations: InlineCommentMap;
+    annotationsLoaded: boolean;
     bookmark?: SelectionBookmark;
     /**
      * Indicates the document has annotations which it does not currently know the resolved state of.

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-annotation",
-	"version": "15.0.13",
+	"version": "15.0.14",
 	"description": "Annotation plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",