@atlaskit/editor-plugin-synced-block 4.6.4 → 4.7.1

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @atlaskit/editor-plugin-synced-block
 
+## 4.7.1
+
+### Patch Changes
+
+- Updated dependencies
+
+## 4.7.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
+
 ## 4.6.4
 
 ### Patch Changes

package/dist/cjs/nodeviews/bodiedSyncedBlock.js

@@ -13,6 +13,7 @@ var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits
 var _react = _interopRequireDefault(require("react"));
 var _reactNodeView = _interopRequireDefault(require("@atlaskit/editor-common/react-node-view"));
 var _syncBlock = require("@atlaskit/editor-common/sync-block");
+var _editorPluginConnectivity = require("@atlaskit/editor-plugin-connectivity");
 var _model = require("@atlaskit/editor-prosemirror/model");
 var _BodiedSyncBlockWrapper = require("../ui/BodiedSyncBlockWrapper");
 function _callSuper(t, o, e) { return o = (0, _getPrototypeOf2.default)(o), (0, _possibleConstructorReturn2.default)(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], (0, _getPrototypeOf2.default)(t).constructor) : o.apply(t, e)); }
@@ -43,7 +44,7 @@ var BodiedSyncBlock = /*#__PURE__*/function (_ReactNodeView) {
         nextViewMode = _ref.nextViewMode;
       var connectivityMode = nextConnectivityMode !== null && nextConnectivityMode !== void 0 ? nextConnectivityMode : (_this$api = this.api) === null || _this$api === void 0 || (_this$api = _this$api.connectivity) === null || _this$api === void 0 || (_this$api = _this$api.sharedState) === null || _this$api === void 0 || (_this$api = _this$api.currentState()) === null || _this$api === void 0 ? void 0 : _this$api.mode;
       var viewMode = nextViewMode !== null && nextViewMode !== void 0 ? nextViewMode : (_this$api2 = this.api) === null || _this$api2 === void 0 || (_this$api2 = _this$api2.editorViewMode) === null || _this$api2 === void 0 || (_this$api2 = _this$api2.sharedState) === null || _this$api2 === void 0 || (_this$api2 = _this$api2.currentState()) === null || _this$api2 === void 0 ? void 0 : _this$api2.mode;
-      var isOnline = connectivityMode !== 'offline';
+      var isOnline = !(0, _editorPluginConnectivity.isOfflineMode)(connectivityMode);
       var isEditMode = viewMode !== 'view';
       var shouldBeEditable = isOnline && isEditMode;
       contentDOM === null || contentDOM === void 0 || contentDOM.setAttribute('contenteditable', shouldBeEditable ? 'true' : 'false');

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

@@ -10,6 +10,7 @@ var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
 var _selection = require("@atlaskit/editor-common/selection");
 var _syncBlock = require("@atlaskit/editor-common/sync-block");
 var _utils = require("@atlaskit/editor-common/utils");
+var _editorPluginConnectivity = require("@atlaskit/editor-plugin-connectivity");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _view = require("@atlaskit/editor-prosemirror/view");
 var _editorSyncedBlockProvider = require("@atlaskit/editor-synced-block-provider");
@@ -96,7 +97,7 @@ var createPlugin = exports.createPlugin = function createPlugin(options, pmPlugi
         var _syncedBlockPluginKey, _syncedBlockPluginKey2, _api$connectivity, _api$editorViewMode;
         var selectionDecorationSet = (_syncedBlockPluginKey = (_syncedBlockPluginKey2 = syncedBlockPluginKey.getState(state)) === null || _syncedBlockPluginKey2 === void 0 ? void 0 : _syncedBlockPluginKey2.selectionDecorationSet) !== null && _syncedBlockPluginKey !== void 0 ? _syncedBlockPluginKey : _view.DecorationSet.empty;
         var doc = state.doc;
-        var isOffline = (api === null || api === void 0 || (_api$connectivity = api.connectivity) === null || _api$connectivity === void 0 || (_api$connectivity = _api$connectivity.sharedState.currentState()) === null || _api$connectivity === void 0 ? void 0 : _api$connectivity.mode) === 'offline';
+        var isOffline = (0, _editorPluginConnectivity.isOfflineMode)(api === null || api === void 0 || (_api$connectivity = api.connectivity) === null || _api$connectivity === void 0 || (_api$connectivity = _api$connectivity.sharedState.currentState()) === null || _api$connectivity === void 0 ? void 0 : _api$connectivity.mode);
         var isViewMode = (api === null || api === void 0 || (_api$editorViewMode = api.editorViewMode) === null || _api$editorViewMode === void 0 || (_api$editorViewMode = _api$editorViewMode.sharedState.currentState()) === null || _api$editorViewMode === void 0 ? void 0 : _api$editorViewMode.mode) === 'view';
         var offlineDecorations = [];
         var viewModeDecorations = [];
@@ -165,7 +166,7 @@ var createPlugin = exports.createPlugin = function createPlugin(options, pmPlugi
     },
     filterTransaction: function filterTransaction(tr, state) {
       var _api$connectivity2;
-      var isOffline = (api === null || api === void 0 || (_api$connectivity2 = api.connectivity) === null || _api$connectivity2 === void 0 || (_api$connectivity2 = _api$connectivity2.sharedState.currentState()) === null || _api$connectivity2 === void 0 ? void 0 : _api$connectivity2.mode) === 'offline';
+      var isOffline = (0, _editorPluginConnectivity.isOfflineMode)(api === null || api === void 0 || (_api$connectivity2 = api.connectivity) === null || _api$connectivity2 === void 0 || (_api$connectivity2 = _api$connectivity2.sharedState.currentState()) === null || _api$connectivity2 === void 0 ? void 0 : _api$connectivity2.mode);
       var isConfirmedSyncBlockDeletion = Boolean(tr.getMeta('isConfirmedSyncBlockDeletion'));
       // Ignore transactions that don't change the document
       // or are from remote (collab) or already confirmed sync block deletion

package/dist/cjs/ui/CreateSyncedBlockButton.js

@@ -10,6 +10,7 @@ var _react = _interopRequireWildcard(require("react"));
 var _reactIntlNext = require("react-intl-next");
 var _hooks = require("@atlaskit/editor-common/hooks");
 var _messages = require("@atlaskit/editor-common/messages");
+var _editorPluginConnectivity = require("@atlaskit/editor-plugin-connectivity");
 var _editorToolbar = require("@atlaskit/editor-toolbar");
 var _blockSynced = _interopRequireDefault(require("@atlaskit/icon-lab/core/block-synced"));
 var _utils = require("../pm-plugins/utils/utils");
@@ -31,7 +32,7 @@ var CreateSyncedBlockButton = exports.CreateSyncedBlockButton = function CreateS
   // and converting existing block to synced block
   var canBeConverted = Boolean(selection && (0, _utils.canBeConvertedToSyncBlock)(selection));
   var canInsertEmptyBlock = Boolean(selection === null || selection === void 0 ? void 0 : selection.empty);
-  var isDisabled = Boolean(mode === 'offline' || !canBeConverted && !canInsertEmptyBlock);
+  var isDisabled = Boolean((0, _editorPluginConnectivity.isOfflineMode)(mode) || !canBeConverted && !canInsertEmptyBlock);
   var onClick = (0, _react.useCallback)(function () {
     var _api$core, _api$core2;
     api === null || api === void 0 || (_api$core = api.core) === null || _api$core === void 0 || _api$core.actions.execute(function (_ref2) {

package/dist/cjs/ui/CreateSyncedBlockDropdownItem.js

@@ -10,6 +10,7 @@ var _react = _interopRequireWildcard(require("react"));
 var _reactIntlNext = require("react-intl-next");
 var _hooks = require("@atlaskit/editor-common/hooks");
 var _messages = require("@atlaskit/editor-common/messages");
+var _editorPluginConnectivity = require("@atlaskit/editor-plugin-connectivity");
 var _editorToolbar = require("@atlaskit/editor-toolbar");
 var _lozenge = _interopRequireDefault(require("@atlaskit/lozenge"));
 var _utils = require("../pm-plugins/utils/utils");
@@ -43,7 +44,7 @@ var CreateSyncedBlockDropdownItem = function CreateSyncedBlockDropdownItem(_ref)
       closeMenu: true
     }));
   };
-  var isOffline = mode === 'offline';
+  var isOffline = (0, _editorPluginConnectivity.isOfflineMode)(mode);
   return /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarDropdownItem, {
     elemBefore: /*#__PURE__*/_react.default.createElement(_editorToolbar.SyncBlocksIcon, {
       label: ""
@@ -78,7 +79,7 @@ var CopySyncedBlockDropdownItem = function CopySyncedBlockDropdownItem(_ref2) {
       label: ""
     }),
     onClick: onClick,
-    isDisabled: mode === 'offline',
+    isDisabled: (0, _editorPluginConnectivity.isOfflineMode)(mode),
     elemAfter: /*#__PURE__*/_react.default.createElement(_lozenge.default, {
       appearance: "new"
     }, formatMessage(_messages.blockMenuMessages.newLozenge))

package/dist/cjs/ui/DeleteConfirmationModal.js

@@ -12,6 +12,7 @@ var _reactIntlNext = require("react-intl-next");
 var _new = _interopRequireDefault(require("@atlaskit/button/new"));
 var _hooks = require("@atlaskit/editor-common/hooks");
 var _messages = require("@atlaskit/editor-common/messages");
+var _editorPluginConnectivity = require("@atlaskit/editor-plugin-connectivity");
 var _modalDialog = _interopRequireWildcard(require("@atlaskit/modal-dialog"));
 var _compiled = require("@atlaskit/primitives/compiled");
 var _main = require("../pm-plugins/main");
@@ -115,7 +116,7 @@ var DeleteConfirmationModal = exports.DeleteConfirmationModal = function DeleteC
     appearance: "warning",
     onClick: handleClick(true),
     autoFocus: true,
-    isDisabled: mode === 'offline',
+    isDisabled: (0, _editorPluginConnectivity.isOfflineMode)(mode),
     isLoading: bodiedSyncBlockDeletionStatus === 'processing'
   }, formatMessage(_messages.syncBlockMessages.deleteConfirmationModalDeleteButton)))));
 };

package/dist/cjs/ui/Flag.js

@@ -11,6 +11,7 @@ var _react = _interopRequireDefault(require("react"));
 var _reactIntlNext = require("react-intl-next");
 var _hooks = require("@atlaskit/editor-common/hooks");
 var _messages = require("@atlaskit/editor-common/messages");
+var _editorPluginConnectivity = require("@atlaskit/editor-plugin-connectivity");
 var _flag = _interopRequireWildcard(require("@atlaskit/flag"));
 var _image = _interopRequireDefault(require("@atlaskit/icon/core/image"));
 var _statusWarning = _interopRequireDefault(require("@atlaskit/icon/core/status-warning"));
@@ -66,7 +67,7 @@ var Flag = exports.Flag = function Flag(_ref) {
     onDismissedCallback = activeFlag.onDismissed;
 
   // Retry button often involves network request, hence we dismiss the flag in offline mode to avoid retry
-  if (mode === 'offline' && !!onRetry) {
+  if ((0, _editorPluginConnectivity.isOfflineMode)(mode) && !!onRetry) {
     api === null || api === void 0 || api.core.actions.execute(function (_ref2) {
       var tr = _ref2.tr;
       tr.setMeta(_main.syncedBlockPluginKey, {

package/dist/es2019/nodeviews/bodiedSyncedBlock.js

@@ -1,6 +1,7 @@
 import React from 'react';
 import ReactNodeView from '@atlaskit/editor-common/react-node-view';
 import { BodiedSyncBlockSharedCssClassName } from '@atlaskit/editor-common/sync-block';
+import { isOfflineMode } from '@atlaskit/editor-plugin-connectivity';
 import { DOMSerializer } from '@atlaskit/editor-prosemirror/model';
 import { BodiedSyncBlockWrapper } from '../ui/BodiedSyncBlockWrapper';
 const toDOM = () => ['div', {
@@ -22,7 +23,7 @@ class BodiedSyncBlock extends ReactNodeView {
     var _this$api, _this$api$connectivit, _this$api$connectivit2, _this$api$connectivit3, _this$api2, _this$api2$editorView, _this$api2$editorView2, _this$api2$editorView3;
     const connectivityMode = nextConnectivityMode !== null && nextConnectivityMode !== void 0 ? nextConnectivityMode : (_this$api = this.api) === null || _this$api === void 0 ? void 0 : (_this$api$connectivit = _this$api.connectivity) === null || _this$api$connectivit === void 0 ? void 0 : (_this$api$connectivit2 = _this$api$connectivit.sharedState) === null || _this$api$connectivit2 === void 0 ? void 0 : (_this$api$connectivit3 = _this$api$connectivit2.currentState()) === null || _this$api$connectivit3 === void 0 ? void 0 : _this$api$connectivit3.mode;
     const viewMode = nextViewMode !== null && nextViewMode !== void 0 ? nextViewMode : (_this$api2 = this.api) === null || _this$api2 === void 0 ? void 0 : (_this$api2$editorView = _this$api2.editorViewMode) === null || _this$api2$editorView === void 0 ? void 0 : (_this$api2$editorView2 = _this$api2$editorView.sharedState) === null || _this$api2$editorView2 === void 0 ? void 0 : (_this$api2$editorView3 = _this$api2$editorView2.currentState()) === null || _this$api2$editorView3 === void 0 ? void 0 : _this$api2$editorView3.mode;
-    const isOnline = connectivityMode !== 'offline';
+    const isOnline = !isOfflineMode(connectivityMode);
     const isEditMode = viewMode !== 'view';
     const shouldBeEditable = isOnline && isEditMode;
     contentDOM === null || contentDOM === void 0 ? void 0 : contentDOM.setAttribute('contenteditable', shouldBeEditable ? 'true' : 'false');

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

@@ -2,6 +2,7 @@ import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { createSelectionClickHandler } from '@atlaskit/editor-common/selection';
 import { BodiedSyncBlockSharedCssClassName, SyncBlockStateCssClassName } from '@atlaskit/editor-common/sync-block';
 import { mapSlice, pmHistoryPluginKey } from '@atlaskit/editor-common/utils';
+import { isOfflineMode } from '@atlaskit/editor-plugin-connectivity';
 import { PluginKey } from '@atlaskit/editor-prosemirror/state';
 import { DecorationSet, Decoration } from '@atlaskit/editor-prosemirror/view';
 import { convertPMNodesToSyncBlockNodes, rebaseTransaction } from '@atlaskit/editor-synced-block-provider';
@@ -86,7 +87,7 @@ export const createPlugin = (options, pmPluginFactoryParams, syncBlockStore, api
         const {
           doc
         } = state;
-        const isOffline = (api === null || api === void 0 ? void 0 : (_api$connectivity = api.connectivity) === null || _api$connectivity === void 0 ? void 0 : (_api$connectivity$sha = _api$connectivity.sharedState.currentState()) === null || _api$connectivity$sha === void 0 ? void 0 : _api$connectivity$sha.mode) === 'offline';
+        const isOffline = 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.currentState()) === null || _api$connectivity$sha === void 0 ? void 0 : _api$connectivity$sha.mode);
         const isViewMode = (api === null || api === void 0 ? void 0 : (_api$editorViewMode = api.editorViewMode) === null || _api$editorViewMode === void 0 ? void 0 : (_api$editorViewMode$s = _api$editorViewMode.sharedState.currentState()) === null || _api$editorViewMode$s === void 0 ? void 0 : _api$editorViewMode$s.mode) === 'view';
         const offlineDecorations = [];
         const viewModeDecorations = [];
@@ -157,7 +158,7 @@ export const createPlugin = (options, pmPluginFactoryParams, syncBlockStore, api
     },
     filterTransaction: (tr, state) => {
       var _api$connectivity2, _api$connectivity2$sh;
-      const isOffline = (api === null || api === void 0 ? void 0 : (_api$connectivity2 = api.connectivity) === null || _api$connectivity2 === void 0 ? void 0 : (_api$connectivity2$sh = _api$connectivity2.sharedState.currentState()) === null || _api$connectivity2$sh === void 0 ? void 0 : _api$connectivity2$sh.mode) === 'offline';
+      const isOffline = isOfflineMode(api === null || api === void 0 ? void 0 : (_api$connectivity2 = api.connectivity) === null || _api$connectivity2 === void 0 ? void 0 : (_api$connectivity2$sh = _api$connectivity2.sharedState.currentState()) === null || _api$connectivity2$sh === void 0 ? void 0 : _api$connectivity2$sh.mode);
       const isConfirmedSyncBlockDeletion = Boolean(tr.getMeta('isConfirmedSyncBlockDeletion'));
       // Ignore transactions that don't change the document
       // or are from remote (collab) or already confirmed sync block deletion

package/dist/es2019/ui/CreateSyncedBlockButton.js

@@ -2,6 +2,7 @@ import React, { useCallback } from 'react';
 import { useIntl } from 'react-intl-next';
 import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
 import { syncBlockMessages } from '@atlaskit/editor-common/messages';
+import { isOfflineMode } from '@atlaskit/editor-plugin-connectivity';
 import { ToolbarButton, ToolbarTooltip } from '@atlaskit/editor-toolbar';
 import BlockSyncedIcon from '@atlaskit/icon-lab/core/block-synced';
 import { canBeConvertedToSyncBlock } from '../pm-plugins/utils/utils';
@@ -24,7 +25,7 @@ export const CreateSyncedBlockButton = ({
   // and converting existing block to synced block
   const canBeConverted = Boolean(selection && canBeConvertedToSyncBlock(selection));
   const canInsertEmptyBlock = Boolean(selection === null || selection === void 0 ? void 0 : selection.empty);
-  const isDisabled = Boolean(mode === 'offline' || !canBeConverted && !canInsertEmptyBlock);
+  const isDisabled = Boolean(isOfflineMode(mode) || !canBeConverted && !canInsertEmptyBlock);
   const onClick = useCallback(() => {
     var _api$core, _api$core2;
     api === null || api === void 0 ? void 0 : (_api$core = api.core) === null || _api$core === void 0 ? void 0 : _api$core.actions.execute(({

package/dist/es2019/ui/CreateSyncedBlockDropdownItem.js

@@ -2,6 +2,7 @@ import React, { useMemo } from 'react';
 import { useIntl } from 'react-intl-next';
 import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
 import { blockMenuMessages } from '@atlaskit/editor-common/messages';
+import { isOfflineMode } from '@atlaskit/editor-plugin-connectivity';
 import { SyncBlocksIcon, ToolbarDropdownItem } from '@atlaskit/editor-toolbar';
 import Lozenge from '@atlaskit/lozenge';
 import { canBeConvertedToSyncBlock } from '../pm-plugins/utils/utils';
@@ -35,7 +36,7 @@ const CreateSyncedBlockDropdownItem = ({
       closeMenu: true
     }));
   };
-  const isOffline = mode === 'offline';
+  const isOffline = isOfflineMode(mode);
   return /*#__PURE__*/React.createElement(ToolbarDropdownItem, {
     elemBefore: /*#__PURE__*/React.createElement(SyncBlocksIcon, {
       label: ""
@@ -73,7 +74,7 @@ const CopySyncedBlockDropdownItem = ({
       label: ""
     }),
     onClick: onClick,
-    isDisabled: mode === 'offline',
+    isDisabled: isOfflineMode(mode),
     elemAfter: /*#__PURE__*/React.createElement(Lozenge, {
       appearance: "new"
     }, formatMessage(blockMenuMessages.newLozenge))

package/dist/es2019/ui/DeleteConfirmationModal.js

@@ -3,6 +3,7 @@ import { useIntl } from 'react-intl-next';
 import Button from '@atlaskit/button/new';
 import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
 import { syncBlockMessages as messages } from '@atlaskit/editor-common/messages';
+import { isOfflineMode } from '@atlaskit/editor-plugin-connectivity';
 import ModalDialog, { ModalBody, ModalFooter, ModalHeader, ModalTitle, ModalTransition } from '@atlaskit/modal-dialog';
 import { Text } from '@atlaskit/primitives/compiled';
 import { syncedBlockPluginKey } from '../pm-plugins/main';
@@ -103,7 +104,7 @@ export const DeleteConfirmationModal = ({
     appearance: "warning",
     onClick: handleClick(true),
     autoFocus: true,
-    isDisabled: mode === 'offline',
+    isDisabled: isOfflineMode(mode),
     isLoading: bodiedSyncBlockDeletionStatus === 'processing'
   }, formatMessage(messages.deleteConfirmationModalDeleteButton)))));
 };

package/dist/es2019/ui/Flag.js

@@ -2,6 +2,7 @@ import React from 'react';
 import { useIntl } from 'react-intl-next';
 import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
 import { syncBlockMessages as messages } from '@atlaskit/editor-common/messages';
+import { isOfflineMode } from '@atlaskit/editor-plugin-connectivity';
 import AkFlag, { AutoDismissFlag, FlagGroup } from '@atlaskit/flag';
 import ImageIcon from '@atlaskit/icon/core/image';
 import StatusWarningIcon from '@atlaskit/icon/core/status-warning';
@@ -66,7 +67,7 @@ export const Flag = ({
   } = activeFlag;
 
   // Retry button often involves network request, hence we dismiss the flag in offline mode to avoid retry
-  if (mode === 'offline' && !!onRetry) {
+  if (isOfflineMode(mode) && !!onRetry) {
     api === null || api === void 0 ? void 0 : api.core.actions.execute(({
       tr
     }) => {

package/dist/esm/nodeviews/bodiedSyncedBlock.js

@@ -8,6 +8,7 @@ function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.
 import React from 'react';
 import ReactNodeView from '@atlaskit/editor-common/react-node-view';
 import { BodiedSyncBlockSharedCssClassName } from '@atlaskit/editor-common/sync-block';
+import { isOfflineMode } from '@atlaskit/editor-plugin-connectivity';
 import { DOMSerializer } from '@atlaskit/editor-prosemirror/model';
 import { BodiedSyncBlockWrapper } from '../ui/BodiedSyncBlockWrapper';
 var toDOM = function toDOM() {
@@ -36,7 +37,7 @@ var BodiedSyncBlock = /*#__PURE__*/function (_ReactNodeView) {
         nextViewMode = _ref.nextViewMode;
       var connectivityMode = nextConnectivityMode !== null && nextConnectivityMode !== void 0 ? nextConnectivityMode : (_this$api = this.api) === null || _this$api === void 0 || (_this$api = _this$api.connectivity) === null || _this$api === void 0 || (_this$api = _this$api.sharedState) === null || _this$api === void 0 || (_this$api = _this$api.currentState()) === null || _this$api === void 0 ? void 0 : _this$api.mode;
       var viewMode = nextViewMode !== null && nextViewMode !== void 0 ? nextViewMode : (_this$api2 = this.api) === null || _this$api2 === void 0 || (_this$api2 = _this$api2.editorViewMode) === null || _this$api2 === void 0 || (_this$api2 = _this$api2.sharedState) === null || _this$api2 === void 0 || (_this$api2 = _this$api2.currentState()) === null || _this$api2 === void 0 ? void 0 : _this$api2.mode;
-      var isOnline = connectivityMode !== 'offline';
+      var isOnline = !isOfflineMode(connectivityMode);
       var isEditMode = viewMode !== 'view';
       var shouldBeEditable = isOnline && isEditMode;
       contentDOM === null || contentDOM === void 0 || contentDOM.setAttribute('contenteditable', shouldBeEditable ? 'true' : 'false');

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

@@ -8,6 +8,7 @@ import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { createSelectionClickHandler } from '@atlaskit/editor-common/selection';
 import { BodiedSyncBlockSharedCssClassName, SyncBlockStateCssClassName } from '@atlaskit/editor-common/sync-block';
 import { mapSlice, pmHistoryPluginKey } from '@atlaskit/editor-common/utils';
+import { isOfflineMode } from '@atlaskit/editor-plugin-connectivity';
 import { PluginKey } from '@atlaskit/editor-prosemirror/state';
 import { DecorationSet, Decoration } from '@atlaskit/editor-prosemirror/view';
 import { convertPMNodesToSyncBlockNodes, rebaseTransaction } from '@atlaskit/editor-synced-block-provider';
@@ -89,7 +90,7 @@ export var createPlugin = function createPlugin(options, pmPluginFactoryParams,
         var _syncedBlockPluginKey, _syncedBlockPluginKey2, _api$connectivity, _api$editorViewMode;
         var selectionDecorationSet = (_syncedBlockPluginKey = (_syncedBlockPluginKey2 = syncedBlockPluginKey.getState(state)) === null || _syncedBlockPluginKey2 === void 0 ? void 0 : _syncedBlockPluginKey2.selectionDecorationSet) !== null && _syncedBlockPluginKey !== void 0 ? _syncedBlockPluginKey : DecorationSet.empty;
         var doc = state.doc;
-        var isOffline = (api === null || api === void 0 || (_api$connectivity = api.connectivity) === null || _api$connectivity === void 0 || (_api$connectivity = _api$connectivity.sharedState.currentState()) === null || _api$connectivity === void 0 ? void 0 : _api$connectivity.mode) === 'offline';
+        var isOffline = isOfflineMode(api === null || api === void 0 || (_api$connectivity = api.connectivity) === null || _api$connectivity === void 0 || (_api$connectivity = _api$connectivity.sharedState.currentState()) === null || _api$connectivity === void 0 ? void 0 : _api$connectivity.mode);
         var isViewMode = (api === null || api === void 0 || (_api$editorViewMode = api.editorViewMode) === null || _api$editorViewMode === void 0 || (_api$editorViewMode = _api$editorViewMode.sharedState.currentState()) === null || _api$editorViewMode === void 0 ? void 0 : _api$editorViewMode.mode) === 'view';
         var offlineDecorations = [];
         var viewModeDecorations = [];
@@ -158,7 +159,7 @@ export var createPlugin = function createPlugin(options, pmPluginFactoryParams,
     },
     filterTransaction: function filterTransaction(tr, state) {
       var _api$connectivity2;
-      var isOffline = (api === null || api === void 0 || (_api$connectivity2 = api.connectivity) === null || _api$connectivity2 === void 0 || (_api$connectivity2 = _api$connectivity2.sharedState.currentState()) === null || _api$connectivity2 === void 0 ? void 0 : _api$connectivity2.mode) === 'offline';
+      var isOffline = isOfflineMode(api === null || api === void 0 || (_api$connectivity2 = api.connectivity) === null || _api$connectivity2 === void 0 || (_api$connectivity2 = _api$connectivity2.sharedState.currentState()) === null || _api$connectivity2 === void 0 ? void 0 : _api$connectivity2.mode);
       var isConfirmedSyncBlockDeletion = Boolean(tr.getMeta('isConfirmedSyncBlockDeletion'));
       // Ignore transactions that don't change the document
       // or are from remote (collab) or already confirmed sync block deletion

package/dist/esm/ui/CreateSyncedBlockButton.js

@@ -2,6 +2,7 @@ import React, { useCallback } from 'react';
 import { useIntl } from 'react-intl-next';
 import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
 import { syncBlockMessages } from '@atlaskit/editor-common/messages';
+import { isOfflineMode } from '@atlaskit/editor-plugin-connectivity';
 import { ToolbarButton, ToolbarTooltip } from '@atlaskit/editor-toolbar';
 import BlockSyncedIcon from '@atlaskit/icon-lab/core/block-synced';
 import { canBeConvertedToSyncBlock } from '../pm-plugins/utils/utils';
@@ -22,7 +23,7 @@ export var CreateSyncedBlockButton = function CreateSyncedBlockButton(_ref) {
   // and converting existing block to synced block
   var canBeConverted = Boolean(selection && canBeConvertedToSyncBlock(selection));
   var canInsertEmptyBlock = Boolean(selection === null || selection === void 0 ? void 0 : selection.empty);
-  var isDisabled = Boolean(mode === 'offline' || !canBeConverted && !canInsertEmptyBlock);
+  var isDisabled = Boolean(isOfflineMode(mode) || !canBeConverted && !canInsertEmptyBlock);
   var onClick = useCallback(function () {
     var _api$core, _api$core2;
     api === null || api === void 0 || (_api$core = api.core) === null || _api$core === void 0 || _api$core.actions.execute(function (_ref2) {

package/dist/esm/ui/CreateSyncedBlockDropdownItem.js

@@ -2,6 +2,7 @@ import React, { useMemo } from 'react';
 import { useIntl } from 'react-intl-next';
 import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
 import { blockMenuMessages } from '@atlaskit/editor-common/messages';
+import { isOfflineMode } from '@atlaskit/editor-plugin-connectivity';
 import { SyncBlocksIcon, ToolbarDropdownItem } from '@atlaskit/editor-toolbar';
 import Lozenge from '@atlaskit/lozenge';
 import { canBeConvertedToSyncBlock } from '../pm-plugins/utils/utils';
@@ -34,7 +35,7 @@ var CreateSyncedBlockDropdownItem = function CreateSyncedBlockDropdownItem(_ref)
       closeMenu: true
     }));
   };
-  var isOffline = mode === 'offline';
+  var isOffline = isOfflineMode(mode);
   return /*#__PURE__*/React.createElement(ToolbarDropdownItem, {
     elemBefore: /*#__PURE__*/React.createElement(SyncBlocksIcon, {
       label: ""
@@ -69,7 +70,7 @@ var CopySyncedBlockDropdownItem = function CopySyncedBlockDropdownItem(_ref2) {
       label: ""
     }),
     onClick: onClick,
-    isDisabled: mode === 'offline',
+    isDisabled: isOfflineMode(mode),
     elemAfter: /*#__PURE__*/React.createElement(Lozenge, {
       appearance: "new"
     }, formatMessage(blockMenuMessages.newLozenge))

package/dist/esm/ui/DeleteConfirmationModal.js

@@ -4,6 +4,7 @@ import { useIntl } from 'react-intl-next';
 import Button from '@atlaskit/button/new';
 import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
 import { syncBlockMessages as messages } from '@atlaskit/editor-common/messages';
+import { isOfflineMode } from '@atlaskit/editor-plugin-connectivity';
 import ModalDialog, { ModalBody, ModalFooter, ModalHeader, ModalTitle, ModalTransition } from '@atlaskit/modal-dialog';
 import { Text } from '@atlaskit/primitives/compiled';
 import { syncedBlockPluginKey } from '../pm-plugins/main';
@@ -106,7 +107,7 @@ export var DeleteConfirmationModal = function DeleteConfirmationModal(_ref) {
     appearance: "warning",
     onClick: handleClick(true),
     autoFocus: true,
-    isDisabled: mode === 'offline',
+    isDisabled: isOfflineMode(mode),
     isLoading: bodiedSyncBlockDeletionStatus === 'processing'
   }, formatMessage(messages.deleteConfirmationModalDeleteButton)))));
 };

package/dist/esm/ui/Flag.js

@@ -5,6 +5,7 @@ import React from 'react';
 import { useIntl } from 'react-intl-next';
 import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
 import { syncBlockMessages as messages } from '@atlaskit/editor-common/messages';
+import { isOfflineMode } from '@atlaskit/editor-plugin-connectivity';
 import AkFlag, { AutoDismissFlag, FlagGroup } from '@atlaskit/flag';
 import ImageIcon from '@atlaskit/icon/core/image';
 import StatusWarningIcon from '@atlaskit/icon/core/status-warning';
@@ -57,7 +58,7 @@ export var Flag = function Flag(_ref) {
     onDismissedCallback = activeFlag.onDismissed;
 
   // Retry button often involves network request, hence we dismiss the flag in offline mode to avoid retry
-  if (mode === 'offline' && !!onRetry) {
+  if (isOfflineMode(mode) && !!onRetry) {
     api === null || api === void 0 || api.core.actions.execute(function (_ref2) {
       var tr = _ref2.tr;
       tr.setMeta(syncedBlockPluginKey, {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-synced-block",
-	"version": "4.6.4",
+	"version": "4.7.1",
 	"description": "SyncedBlock plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -29,11 +29,11 @@
 	"atlaskit:src": "src/index.ts",
 	"dependencies": {
 		"@atlaskit/adf-schema": "^51.5.0",
-		"@atlaskit/button": "23.9.1",
+		"@atlaskit/button": "23.9.2",
 		"@atlaskit/editor-json-transformer": "^8.31.0",
 		"@atlaskit/editor-plugin-analytics": "^6.2.0",
 		"@atlaskit/editor-plugin-block-menu": "^5.2.0",
-		"@atlaskit/editor-plugin-connectivity": "6.0.0",
+		"@atlaskit/editor-plugin-connectivity": "6.1.0",
 		"@atlaskit/editor-plugin-decorations": "^6.1.0",
 		"@atlaskit/editor-plugin-floating-toolbar": "^8.3.0",
 		"@atlaskit/editor-plugin-selection": "^6.1.0",