@atlaskit/editor-plugin-annotation 6.3.1 → 6.4.0

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @atlaskit/editor-plugin-annotation
 
+## 6.4.0
+
+### Minor Changes
+
+- [`82d57d01a0f61`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/82d57d01a0f61) -
+  Distinguish between collab offline and internet offline cases for connectivity mode
+
+### Patch Changes
+
+- Updated dependencies
+
+## 6.3.2
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 6.3.1
 
 ### Patch Changes

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

@@ -11,6 +11,7 @@ var _keymaps = require("@atlaskit/editor-common/keymaps");
 var _mediaSingle = require("@atlaskit/editor-common/media-single");
 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 _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
@@ -93,7 +94,7 @@ var buildToolbar = exports.buildToolbar = function buildToolbar(editorAnalyticsA
     var createComment = {
       type: 'button',
       showTitle: true,
-      disabled: isCommentButtonDisabled || (api === null || api === void 0 || (_api$connectivity = api.connectivity) === null || _api$connectivity === void 0 || (_api$connectivity = _api$connectivity.sharedState) === null || _api$connectivity === void 0 || (_api$connectivity = _api$connectivity.currentState()) === null || _api$connectivity === void 0 ? void 0 : _api$connectivity.mode) === 'offline',
+      disabled: isCommentButtonDisabled || (0, _editorPluginConnectivity.isOfflineMode)(api === null || api === void 0 || (_api$connectivity = api.connectivity) === null || _api$connectivity === void 0 || (_api$connectivity = _api$connectivity.sharedState) === null || _api$connectivity === void 0 || (_api$connectivity = _api$connectivity.currentState()) === null || _api$connectivity === void 0 ? void 0 : _api$connectivity.mode),
       testId: _types.AnnotationTestIds.floatingToolbarCreateButton,
       interactionName: 'start-inline-comment-action',
       icon: _comment.default,

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

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 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 _editorPluginConnectivity = require("@atlaskit/editor-plugin-connectivity");
 var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _editorCommands = require("../../editor-commands");
 var _utils = require("../../pm-plugins/utils");
@@ -16,7 +17,7 @@ var isButtonDisabled = exports.isButtonDisabled = function isButtonDisabled(_ref
     api = _ref.api,
     canAddComments = _ref.canAddComments;
   var annotationSelectionType = state ? (0, _utils.isSelectionValid)(state) : _types.AnnotationSelectionType.INVALID;
-  return !canAddComments || annotationSelectionType === _types.AnnotationSelectionType.DISABLED || (api === null || api === void 0 || (_api$connectivity = api.connectivity) === null || _api$connectivity === void 0 || (_api$connectivity = _api$connectivity.sharedState) === null || _api$connectivity === void 0 || (_api$connectivity = _api$connectivity.currentState()) === null || _api$connectivity === void 0 ? void 0 : _api$connectivity.mode) === 'offline';
+  return !canAddComments || annotationSelectionType === _types.AnnotationSelectionType.DISABLED || (0, _editorPluginConnectivity.isOfflineMode)(api === null || api === void 0 || (_api$connectivity = api.connectivity) === null || _api$connectivity === void 0 || (_api$connectivity = _api$connectivity.sharedState) === null || _api$connectivity === void 0 || (_api$connectivity = _api$connectivity.currentState()) === null || _api$connectivity === void 0 ? void 0 : _api$connectivity.mode);
 };
 var shouldShowCommentButton = exports.shouldShowCommentButton = function shouldShowCommentButton(_ref2) {
   var state = _ref2.state,

package/dist/cjs/ui/InlineCommentView.js

@@ -13,6 +13,7 @@ var _analytics = require("@atlaskit/editor-common/analytics");
 var _hooks = require("@atlaskit/editor-common/hooks");
 var _useSharedPluginStateSelector = require("@atlaskit/editor-common/use-shared-plugin-state-selector");
 var _utils = require("@atlaskit/editor-common/utils");
+var _editorPluginConnectivity = require("@atlaskit/editor-plugin-connectivity");
 var _utils2 = require("@atlaskit/editor-prosemirror/utils");
 var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _editorCommands = require("../editor-commands");
@@ -149,7 +150,7 @@ function InlineCommentView(_ref) {
       },
       inlineNodeTypes: inlineNodeTypes,
       isOpeningMediaCommentFromToolbar: isOpeningMediaCommentFromToolbar,
-      isOffline: networkStatusSelector === 'offline'
+      isOffline: (0, _editorPluginConnectivity.isOfflineMode)(networkStatusSelector)
     }));
   }
 
@@ -210,6 +211,6 @@ function InlineCommentView(_ref) {
       (0, _editorCommands.closeComponent)()(editorView.state, editorView.dispatch);
     },
     isOpeningMediaCommentFromToolbar: isOpeningMediaCommentFromToolbar,
-    isOffline: networkStatusSelector === 'offline'
+    isOffline: (0, _editorPluginConnectivity.isOfflineMode)(networkStatusSelector)
   }));
 }

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

@@ -4,6 +4,7 @@ import { ToolTipContent, addInlineComment } from '@atlaskit/editor-common/keymap
 import { currentMediaNodeWithPos } from '@atlaskit/editor-common/media-single';
 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 { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
@@ -88,7 +89,7 @@ export const buildToolbar = editorAnalyticsAPI => ({
   const createComment = {
     type: 'button',
     showTitle: true,
-    disabled: isCommentButtonDisabled || (api === null || api === void 0 ? void 0 : (_api$connectivity = api.connectivity) === null || _api$connectivity === void 0 ? void 0 : (_api$connectivity$sha = _api$connectivity.sharedState) === null || _api$connectivity$sha === void 0 ? void 0 : (_api$connectivity$sha2 = _api$connectivity$sha.currentState()) === null || _api$connectivity$sha2 === void 0 ? void 0 : _api$connectivity$sha2.mode) === 'offline',
+    disabled: isCommentButtonDisabled || isOfflineMode(api === null || api === void 0 ? void 0 : (_api$connectivity = api.connectivity) === null || _api$connectivity === void 0 ? void 0 : (_api$connectivity$sha = _api$connectivity.sharedState) === null || _api$connectivity$sha === void 0 ? void 0 : (_api$connectivity$sha2 = _api$connectivity$sha.currentState()) === null || _api$connectivity$sha2 === void 0 ? void 0 : _api$connectivity$sha2.mode),
     testId: AnnotationTestIds.floatingToolbarCreateButton,
     interactionName: 'start-inline-comment-action',
     icon: CommentIcon,

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

@@ -1,5 +1,6 @@
 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 { isOfflineMode } from '@atlaskit/editor-plugin-connectivity';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { setInlineCommentDraftState } from '../../editor-commands';
 import { inlineCommentPluginKey, isSelectionValid } from '../../pm-plugins/utils';
@@ -11,7 +12,7 @@ export const isButtonDisabled = ({
 }) => {
   var _api$connectivity, _api$connectivity$sha, _api$connectivity$sha2;
   const annotationSelectionType = state ? isSelectionValid(state) : AnnotationSelectionType.INVALID;
-  return !canAddComments || annotationSelectionType === AnnotationSelectionType.DISABLED || (api === null || api === void 0 ? void 0 : (_api$connectivity = api.connectivity) === null || _api$connectivity === void 0 ? void 0 : (_api$connectivity$sha = _api$connectivity.sharedState) === null || _api$connectivity$sha === void 0 ? void 0 : (_api$connectivity$sha2 = _api$connectivity$sha.currentState()) === null || _api$connectivity$sha2 === void 0 ? void 0 : _api$connectivity$sha2.mode) === 'offline';
+  return !canAddComments || annotationSelectionType === AnnotationSelectionType.DISABLED || isOfflineMode(api === null || api === void 0 ? void 0 : (_api$connectivity = api.connectivity) === null || _api$connectivity === void 0 ? void 0 : (_api$connectivity$sha = _api$connectivity.sharedState) === null || _api$connectivity$sha === void 0 ? void 0 : (_api$connectivity$sha2 = _api$connectivity$sha.currentState()) === null || _api$connectivity$sha2 === void 0 ? void 0 : _api$connectivity$sha2.mode);
 };
 export const shouldShowCommentButton = ({
   state,

package/dist/es2019/ui/InlineCommentView.js

@@ -4,6 +4,7 @@ import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, CONTENT_COMPONENT, EVENT_TYP
 import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
 import { useSharedPluginStateSelector } from '@atlaskit/editor-common/use-shared-plugin-state-selector';
 import { getAnnotationInlineNodeTypes, getRangeInlineNodeNames } from '@atlaskit/editor-common/utils';
+import { isOfflineMode } from '@atlaskit/editor-plugin-connectivity';
 import { findDomRefAtPos } from '@atlaskit/editor-prosemirror/utils';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { closeComponent, createAnnotation, removeInlineCommentNearSelection, setInlineCommentDraftState, updateInlineCommentResolvedState } from '../editor-commands';
@@ -147,7 +148,7 @@ export function InlineCommentView({
       },
       inlineNodeTypes: inlineNodeTypes,
       isOpeningMediaCommentFromToolbar: isOpeningMediaCommentFromToolbar,
-      isOffline: networkStatusSelector === 'offline'
+      isOffline: isOfflineMode(networkStatusSelector)
     }));
   }
 
@@ -202,6 +203,6 @@ export function InlineCommentView({
       closeComponent()(editorView.state, editorView.dispatch);
     },
     isOpeningMediaCommentFromToolbar: isOpeningMediaCommentFromToolbar,
-    isOffline: networkStatusSelector === 'offline'
+    isOffline: isOfflineMode(networkStatusSelector)
   }));
 }

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

@@ -4,6 +4,7 @@ import { ToolTipContent, addInlineComment } from '@atlaskit/editor-common/keymap
 import { currentMediaNodeWithPos } from '@atlaskit/editor-common/media-single';
 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 { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
@@ -86,7 +87,7 @@ export var buildToolbar = function buildToolbar(editorAnalyticsAPI) {
     var createComment = {
       type: 'button',
       showTitle: true,
-      disabled: isCommentButtonDisabled || (api === null || api === void 0 || (_api$connectivity = api.connectivity) === null || _api$connectivity === void 0 || (_api$connectivity = _api$connectivity.sharedState) === null || _api$connectivity === void 0 || (_api$connectivity = _api$connectivity.currentState()) === null || _api$connectivity === void 0 ? void 0 : _api$connectivity.mode) === 'offline',
+      disabled: isCommentButtonDisabled || isOfflineMode(api === null || api === void 0 || (_api$connectivity = api.connectivity) === null || _api$connectivity === void 0 || (_api$connectivity = _api$connectivity.sharedState) === null || _api$connectivity === void 0 || (_api$connectivity = _api$connectivity.currentState()) === null || _api$connectivity === void 0 ? void 0 : _api$connectivity.mode),
       testId: AnnotationTestIds.floatingToolbarCreateButton,
       interactionName: 'start-inline-comment-action',
       icon: CommentIcon,

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

@@ -1,5 +1,6 @@
 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 { isOfflineMode } from '@atlaskit/editor-plugin-connectivity';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { setInlineCommentDraftState } from '../../editor-commands';
 import { inlineCommentPluginKey, isSelectionValid } from '../../pm-plugins/utils';
@@ -10,7 +11,7 @@ export var isButtonDisabled = function isButtonDisabled(_ref) {
     api = _ref.api,
     canAddComments = _ref.canAddComments;
   var annotationSelectionType = state ? isSelectionValid(state) : AnnotationSelectionType.INVALID;
-  return !canAddComments || annotationSelectionType === AnnotationSelectionType.DISABLED || (api === null || api === void 0 || (_api$connectivity = api.connectivity) === null || _api$connectivity === void 0 || (_api$connectivity = _api$connectivity.sharedState) === null || _api$connectivity === void 0 || (_api$connectivity = _api$connectivity.currentState()) === null || _api$connectivity === void 0 ? void 0 : _api$connectivity.mode) === 'offline';
+  return !canAddComments || annotationSelectionType === AnnotationSelectionType.DISABLED || isOfflineMode(api === null || api === void 0 || (_api$connectivity = api.connectivity) === null || _api$connectivity === void 0 || (_api$connectivity = _api$connectivity.sharedState) === null || _api$connectivity === void 0 || (_api$connectivity = _api$connectivity.currentState()) === null || _api$connectivity === void 0 ? void 0 : _api$connectivity.mode);
 };
 export var shouldShowCommentButton = function shouldShowCommentButton(_ref2) {
   var state = _ref2.state,

package/dist/esm/ui/InlineCommentView.js

@@ -5,6 +5,7 @@ import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, CONTENT_COMPONENT, EVENT_TYP
 import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
 import { useSharedPluginStateSelector } from '@atlaskit/editor-common/use-shared-plugin-state-selector';
 import { getAnnotationInlineNodeTypes, getRangeInlineNodeNames } from '@atlaskit/editor-common/utils';
+import { isOfflineMode } from '@atlaskit/editor-plugin-connectivity';
 import { findDomRefAtPos } from '@atlaskit/editor-prosemirror/utils';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { closeComponent, createAnnotation, removeInlineCommentNearSelection, setInlineCommentDraftState, updateInlineCommentResolvedState } from '../editor-commands';
@@ -140,7 +141,7 @@ export function InlineCommentView(_ref) {
       },
       inlineNodeTypes: inlineNodeTypes,
       isOpeningMediaCommentFromToolbar: isOpeningMediaCommentFromToolbar,
-      isOffline: networkStatusSelector === 'offline'
+      isOffline: isOfflineMode(networkStatusSelector)
     }));
   }
 
@@ -201,6 +202,6 @@ export function InlineCommentView(_ref) {
       closeComponent()(editorView.state, editorView.dispatch);
     },
     isOpeningMediaCommentFromToolbar: isOpeningMediaCommentFromToolbar,
-    isOffline: networkStatusSelector === 'offline'
+    isOffline: isOfflineMode(networkStatusSelector)
   }));
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-annotation",
-	"version": "6.3.1",
+	"version": "6.4.0",
 	"description": "Annotation plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -27,29 +27,29 @@
 	"sideEffects": false,
 	"atlaskit:src": "src/index.ts",
 	"dependencies": {
-		"@atlaskit/adf-schema": "^51.5.1",
+		"@atlaskit/adf-schema": "^51.5.0",
 		"@atlaskit/editor-plugin-analytics": "^6.2.0",
-		"@atlaskit/editor-plugin-connectivity": "^6.0.0",
+		"@atlaskit/editor-plugin-connectivity": "^6.1.0",
 		"@atlaskit/editor-plugin-editor-viewmode-effects": "^6.1.0",
 		"@atlaskit/editor-plugin-feature-flags": "^5.0.0",
-		"@atlaskit/editor-plugin-toolbar": "^3.4.0",
+		"@atlaskit/editor-plugin-toolbar": "^3.5.0",
 		"@atlaskit/editor-plugin-user-intent": "^4.0.0",
-		"@atlaskit/editor-prosemirror": "7.0.0",
+		"@atlaskit/editor-prosemirror": "^7.2.0",
 		"@atlaskit/editor-toolbar": "^0.18.0",
 		"@atlaskit/editor-toolbar-model": "^0.2.0",
-		"@atlaskit/icon": "^29.0.0",
+		"@atlaskit/icon": "^29.3.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
-		"@atlaskit/tmp-editor-statsig": "^15.0.0",
+		"@atlaskit/tmp-editor-statsig": "^16.0.0",
 		"@babel/runtime": "^7.0.0",
 		"react-intl-next": "npm:react-intl@^5.18.1"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^110.40.0",
+		"@atlaskit/editor-common": "^110.46.0",
 		"react": "^18.2.0",
 		"react-dom": "^18.2.0"
 	},
 	"devDependencies": {
-		"@testing-library/react": "^13.4.0",
+		"@testing-library/react": "^16.3.0",
 		"wait-for-expect": "^1.2.0"
 	},
 	"techstack": {