@atlaskit/editor-plugin-synced-block 4.4.0 → 4.5.0

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

@@ -1,16 +1,20 @@
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
 function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t.return || t.return(); } finally { if (u) throw o; } } }; }
 function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
 function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
+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) { _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 { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { createSelectionClickHandler } from '@atlaskit/editor-common/selection';
 import { BodiedSyncBlockSharedCssClassName, SyncBlockStateCssClassName } from '@atlaskit/editor-common/sync-block';
-import { pmHistoryPluginKey } from '@atlaskit/editor-common/utils';
+import { mapSlice, pmHistoryPluginKey } from '@atlaskit/editor-common/utils';
 import { PluginKey } from '@atlaskit/editor-prosemirror/state';
 import { DecorationSet, Decoration } from '@atlaskit/editor-prosemirror/view';
 import { convertPMNodesToSyncBlockNodes, rebaseTransaction } from '@atlaskit/editor-synced-block-provider';
 import { lazyBodiedSyncBlockView } from '../nodeviews/bodiedLazySyncedBlock';
 import { lazySyncBlockView } from '../nodeviews/lazySyncedBlock';
 import { FLAG_ID } from '../types';
+import { handleBodiedSyncBlockRemoval } from './utils/handle-bodied-sync-block-removal';
 import { shouldIgnoreDomEvent } from './utils/ignore-dom-event';
 import { calculateDecorations } from './utils/selection-decorations';
 import { hasEditInSyncBlock, trackSyncBlocks } from './utils/track-sync-blocks';
@@ -19,7 +23,9 @@ export var createPlugin = function createPlugin(options, pmPluginFactoryParams,
   var _ref = options || {},
     _ref$useLongPressSele = _ref.useLongPressSelection,
     useLongPressSelection = _ref$useLongPressSele === void 0 ? false : _ref$useLongPressSele;
-  var confirmationTransaction;
+  var confirmationTransactionRef = {
+    current: undefined
+  };
   return new SafePlugin({
     key: syncedBlockPluginKey,
     state: {
@@ -30,23 +36,25 @@ export var createPlugin = function createPlugin(options, pmPluginFactoryParams,
         syncBlockStore.referenceManager.fetchSyncBlocksData(convertPMNodesToSyncBlockNodes(syncBlockNodes));
         return {
           selectionDecorationSet: calculateDecorations(instance.doc, instance.selection, instance.schema),
-          showFlag: false,
+          activeFlag: false,
           syncBlockStore: syncBlockStore
         };
       },
       apply: function apply(tr, currentPluginState, oldEditorState) {
-        var _meta$showFlag;
+        var _meta$activeFlag, _meta$bodiedSyncBlock;
         var meta = tr.getMeta(syncedBlockPluginKey);
-        var showFlag = currentPluginState.showFlag,
-          selectionDecorationSet = currentPluginState.selectionDecorationSet;
+        var activeFlag = currentPluginState.activeFlag,
+          selectionDecorationSet = currentPluginState.selectionDecorationSet,
+          bodiedSyncBlockDeletionStatus = currentPluginState.bodiedSyncBlockDeletionStatus;
         var newDecorationSet = selectionDecorationSet.map(tr.mapping, tr.doc);
         if (!tr.selection.eq(oldEditorState.selection)) {
           newDecorationSet = calculateDecorations(tr.doc, tr.selection, tr.doc.type.schema);
         }
         return {
-          showFlag: (_meta$showFlag = meta === null || meta === void 0 ? void 0 : meta.showFlag) !== null && _meta$showFlag !== void 0 ? _meta$showFlag : showFlag,
+          activeFlag: (_meta$activeFlag = meta === null || meta === void 0 ? void 0 : meta.activeFlag) !== null && _meta$activeFlag !== void 0 ? _meta$activeFlag : activeFlag,
           selectionDecorationSet: newDecorationSet,
-          syncBlockStore: syncBlockStore
+          syncBlockStore: syncBlockStore,
+          bodiedSyncBlockDeletionStatus: (_meta$bodiedSyncBlock = meta === null || meta === void 0 ? void 0 : meta.bodiedSyncBlockDeletionStatus) !== null && _meta$bodiedSyncBlock !== void 0 ? _meta$bodiedSyncBlock : bodiedSyncBlockDeletionStatus
         };
       }
     },
@@ -97,6 +105,36 @@ export var createPlugin = function createPlugin(options, pmPluginFactoryParams,
         mousedown: function mousedown(view, event) {
           return shouldIgnoreDomEvent(view, event, api);
         }
+      },
+      transformCopied: function transformCopied(slice, _ref2) {
+        var state = _ref2.state;
+        var pluginState = syncedBlockPluginKey.getState(state);
+        var syncBlockStore = pluginState === null || pluginState === void 0 ? void 0 : pluginState.syncBlockStore;
+        var schema = state.schema;
+        if (!syncBlockStore) {
+          return slice;
+        }
+        return mapSlice(slice, function (node) {
+          if (node.type.name === 'bodiedSyncBlock' && node.attrs.resourceId) {
+            try {
+              var newResourceId = syncBlockStore.referenceManager.generateResourceIdForReference(node.attrs.resourceId);
+              // Convert bodiedSyncBlock to syncBlock
+              // The paste transformation will regenrate the localId
+              var newAttrs = _objectSpread(_objectSpread({}, node.attrs), {}, {
+                resourceId: newResourceId
+              });
+              var newMarks = schema.nodes.syncBlock.markSet ? node.marks.filter(function (mark) {
+                var _schema$nodes$syncBlo;
+                return (_schema$nodes$syncBlo = schema.nodes.syncBlock.markSet) === null || _schema$nodes$syncBlo === void 0 ? void 0 : _schema$nodes$syncBlo.includes(mark.type);
+              }) : node.marks;
+              return schema.nodes.syncBlock.create(newAttrs, null, newMarks);
+            } catch (error) {
+              // If generateResourceIdForReference died, return the original node
+              return node;
+            }
+          }
+          return node;
+        });
       }
     },
     filterTransaction: function filterTransaction(tr, state) {
@@ -115,28 +153,8 @@ export var createPlugin = function createPlugin(options, pmPluginFactoryParams,
         bodiedSyncBlockAdded = _trackSyncBlocks.added;
       if (!isOffline) {
         if (bodiedSyncBlockRemoved.length > 0) {
-          // If there are source sync blocks being removed, and we need to confirm with user before deleting,
-          // we block the transaction here, and wait for user confirmation to proceed with deletion.
-          // See editor-common/src/sync-block/sync-block-store-manager.ts for how we handle user confirmation and
-          // proceed with deletion.
-          confirmationTransaction = tr;
-          syncBlockStore.sourceManager.deleteSyncBlocksWithConfirmation(bodiedSyncBlockRemoved.map(function (node) {
-            return node.attrs;
-          }), function () {
-            var _api$core;
-            api === null || api === void 0 || (_api$core = api.core) === null || _api$core === void 0 || _api$core.actions.execute(function () {
-              var trToDispatch = tr.setMeta('isConfirmedSyncBlockDeletion', true);
-              if (!trToDispatch.getMeta(pmHistoryPluginKey)) {
-                // bodiedSyncBlock deletion is expected to be permanent (cannot undo)
-                // For a normal deletion (not triggered by undo), remove it from history so that it cannot be undone
-                trToDispatch.setMeta('addToHistory', false);
-              }
-              return trToDispatch;
-            });
-          }).finally(function () {
-            confirmationTransaction = undefined;
-          });
-          return false;
+          confirmationTransactionRef.current = tr;
+          return handleBodiedSyncBlockRemoval(tr, bodiedSyncBlockRemoved, syncBlockStore, api, confirmationTransactionRef);
         }
         if (bodiedSyncBlockAdded.length > 0) {
           if (Boolean(tr.getMeta(pmHistoryPluginKey))) {
@@ -150,8 +168,8 @@ export var createPlugin = function createPlugin(options, pmPluginFactoryParams,
           // we need to intercept the transaction and save it in insert callback so that we only insert it to the document when backend call if backend call is successful
           // The callback will be evoked by in SourceSyncBlockStoreManager.commitPendingCreation
           syncBlockStore.sourceManager.registerCreationCallback(function () {
-            var _api$core2;
-            api === null || api === void 0 || (_api$core2 = api.core) === null || _api$core2 === void 0 || _api$core2.actions.execute(function () {
+            var _api$core;
+            api === null || api === void 0 || (_api$core = api.core) === null || _api$core === void 0 || _api$core.actions.execute(function () {
               return tr.setMeta('isCommitSyncBlockCreation', true);
             });
             api === null || api === void 0 || api.core.actions.focus();
@@ -177,10 +195,12 @@ export var createPlugin = function createPlugin(options, pmPluginFactoryParams,
         if (errorFlag) {
           // Use setTimeout to dispatch transaction in next tick and avoid re-entrant dispatch
           setTimeout(function () {
-            api === null || api === void 0 || api.core.actions.execute(function (_ref2) {
-              var tr = _ref2.tr;
+            api === null || api === void 0 || api.core.actions.execute(function (_ref3) {
+              var tr = _ref3.tr;
               return tr.setMeta(syncedBlockPluginKey, {
-                showFlag: errorFlag
+                activeFlag: {
+                  id: errorFlag
+                }
               });
             });
           }, 0);
@@ -193,8 +213,8 @@ export var createPlugin = function createPlugin(options, pmPluginFactoryParams,
       trs.filter(function (tr) {
         return tr.docChanged;
       }).forEach(function (tr) {
-        if (confirmationTransaction) {
-          confirmationTransaction = rebaseTransaction(confirmationTransaction, tr, newState);
+        if (confirmationTransactionRef.current) {
+          confirmationTransactionRef.current = rebaseTransaction(confirmationTransactionRef.current, tr, newState);
         }
       });
       var _iterator = _createForOfIteratorHelper(trs),

package/dist/esm/pm-plugins/utils/handle-bodied-sync-block-removal.js

@@ -0,0 +1,80 @@
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
+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) { _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 { pmHistoryPluginKey } from '@atlaskit/editor-common/utils';
+import { FLAG_ID } from '../../types';
+import { syncedBlockPluginKey } from '../main';
+var onRetry = function onRetry(api, syncBlockStore) {
+  return function () {
+    var _api$core;
+    api === null || api === void 0 || (_api$core = api.core) === null || _api$core === void 0 || _api$core.actions.execute(function (_ref) {
+      var tr = _ref.tr;
+      return tr.setMeta(syncedBlockPluginKey, {
+        bodiedSyncBlockDeletionStatus: 'processing',
+        activeFlag: false
+      });
+    });
+    syncBlockStore.sourceManager.retryDeletion();
+  };
+};
+var onDismissed = function onDismissed(syncBlockStore) {
+  return function (tr) {
+    syncBlockStore.sourceManager.clearPendingDeletion();
+    return tr.setMeta(syncedBlockPluginKey, {
+      bodiedSyncBlockDeletionStatus: 'none'
+    });
+  };
+};
+export var handleBodiedSyncBlockRemoval = function handleBodiedSyncBlockRemoval(tr, bodiedSyncBlockRemoved, syncBlockStore, api, confirmationTransactionRef) {
+  // Clear potential old pending deletion to retreat the deletion as first attempt
+  syncBlockStore.sourceManager.clearPendingDeletion();
+
+  // If there are source sync blocks being removed, and we need to confirm with user before deleting,
+  // we block the transaction here, and wait for user confirmation to proceed with deletion.
+  // See editor-common/src/sync-block/sync-block-store-manager.ts for how we handle user confirmation and
+  // proceed with deletion.
+  syncBlockStore.sourceManager.deleteSyncBlocksWithConfirmation(bodiedSyncBlockRemoved.map(function (node) {
+    return node.attrs;
+  }), function () {
+    var _api$core2;
+    var confirmationTransaction = confirmationTransactionRef.current;
+    if (!confirmationTransaction) {
+      return;
+    }
+    api === null || api === void 0 || (_api$core2 = api.core) === null || _api$core2 === void 0 || _api$core2.actions.execute(function () {
+      var trToDispatch = confirmationTransaction.setMeta('isConfirmedSyncBlockDeletion', true);
+      if (!trToDispatch.getMeta(pmHistoryPluginKey)) {
+        // bodiedSyncBlock deletion is expected to be permanent (cannot undo)
+        // For a normal deletion (not triggered by undo), remove it from history so that it cannot be undone
+        trToDispatch.setMeta('addToHistory', false);
+      }
+      return trToDispatch;
+    });
+  }, function (success) {
+    var _api$core3;
+    api === null || api === void 0 || (_api$core3 = api.core) === null || _api$core3 === void 0 || _api$core3.actions.execute(function (_ref2) {
+      var tr = _ref2.tr;
+      var newState;
+      if (!success) {
+        newState = {
+          activeFlag: {
+            id: FLAG_ID.FAIL_TO_DELETE,
+            onRetry: onRetry(api, syncBlockStore),
+            onDismissed: onDismissed(syncBlockStore)
+          }
+        };
+      }
+      newState = _objectSpread(_objectSpread({}, newState), {}, {
+        bodiedSyncBlockDeletionStatus: syncBlockStore.sourceManager.isRetryingDeletion() ?
+        // For retry, reset to none directly to clean up the status
+        'none' :
+        // For the first attempt, set to completed for deletion modal can close the modal
+        'completed'
+      });
+      return tr.setMeta(syncedBlockPluginKey, newState);
+    });
+  }, function () {
+    confirmationTransactionRef.current = undefined;
+  });
+  return false;
+};

package/dist/esm/syncedBlockPlugin.js

@@ -106,11 +106,13 @@ export var syncedBlockPlugin = function syncedBlockPlugin(_ref) {
         return;
       }
       var _syncedBlockPluginKey = syncedBlockPluginKey.getState(editorState),
-        showFlag = _syncedBlockPluginKey.showFlag,
-        currentSyncBlockStore = _syncedBlockPluginKey.syncBlockStore;
+        activeFlag = _syncedBlockPluginKey.activeFlag,
+        currentSyncBlockStore = _syncedBlockPluginKey.syncBlockStore,
+        bodiedSyncBlockDeletionStatus = _syncedBlockPluginKey.bodiedSyncBlockDeletionStatus;
       return {
-        showFlag: showFlag,
-        syncBlockStore: currentSyncBlockStore
+        activeFlag: activeFlag,
+        syncBlockStore: currentSyncBlockStore,
+        bodiedSyncBlockDeletionStatus: bodiedSyncBlockDeletionStatus
       };
     }
   };

package/dist/esm/types/index.js

@@ -2,5 +2,6 @@ export var FLAG_ID = /*#__PURE__*/function (FLAG_ID) {
   FLAG_ID["CANNOT_DELETE_WHEN_OFFLINE"] = "cannot-delete-when-offline";
   FLAG_ID["CANNOT_EDIT_WHEN_OFFLINE"] = "cannot-edit-when-offline";
   FLAG_ID["CANNOT_CREATE_WHEN_OFFLINE"] = "cannot-create-when-offline";
+  FLAG_ID["FAIL_TO_DELETE"] = "fail-to-delete";
   return FLAG_ID;
 }({});

package/dist/esm/ui/DeleteConfirmationModal.js

@@ -6,7 +6,9 @@ import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks'
 import { syncBlockMessages as messages } from '@atlaskit/editor-common/messages';
 import ModalDialog, { ModalBody, ModalFooter, ModalHeader, ModalTitle, ModalTransition } from '@atlaskit/modal-dialog';
 import { Text } from '@atlaskit/primitives/compiled';
+import { syncedBlockPluginKey } from '../pm-plugins/main';
 export var DeleteConfirmationModal = function DeleteConfirmationModal(_ref) {
+  var _api$core2, _api$core4, _api$core6;
   var syncBlockStoreManager = _ref.syncBlockStoreManager,
     api = _ref.api;
   var _useState = useState(false),
@@ -17,41 +19,79 @@ export var DeleteConfirmationModal = function DeleteConfirmationModal(_ref) {
     _useState4 = _slicedToArray(_useState3, 2),
     syncBlockCount = _useState4[0],
     setSyncBlockCount = _useState4[1];
-  var _useSharedPluginState = useSharedPluginStateWithSelector(api, ['connectivity'], function (states) {
-      var _states$connectivityS;
+  var _useSharedPluginState = useSharedPluginStateWithSelector(api, ['connectivity', 'syncedBlock'], function (states) {
+      var _states$connectivityS, _states$syncedBlockSt, _states$syncedBlockSt2;
       return {
-        mode: (_states$connectivityS = states.connectivityState) === null || _states$connectivityS === void 0 ? void 0 : _states$connectivityS.mode
+        mode: (_states$connectivityS = states.connectivityState) === null || _states$connectivityS === void 0 ? void 0 : _states$connectivityS.mode,
+        bodiedSyncBlockDeletionStatus: (_states$syncedBlockSt = states.syncedBlockState) === null || _states$syncedBlockSt === void 0 ? void 0 : _states$syncedBlockSt.bodiedSyncBlockDeletionStatus,
+        activeFlag: (_states$syncedBlockSt2 = states.syncedBlockState) === null || _states$syncedBlockSt2 === void 0 ? void 0 : _states$syncedBlockSt2.activeFlag
       };
     }),
-    mode = _useSharedPluginState.mode;
+    mode = _useSharedPluginState.mode,
+    bodiedSyncBlockDeletionStatus = _useSharedPluginState.bodiedSyncBlockDeletionStatus,
+    activeFlag = _useSharedPluginState.activeFlag;
   var _useIntl = useIntl(),
     formatMessage = _useIntl.formatMessage;
   var resolverRef = React.useRef(undefined);
-  var handleClose = useCallback(function (confirm) {
+  var handleClick = useCallback(function (confirm) {
     return function () {
+      var _api$core;
       if (resolverRef.current) {
         resolverRef.current(confirm);
         resolverRef.current = undefined;
       }
-      setIsOpen(false);
+      if (!confirm) {
+        setIsOpen(false);
+      }
+      api === null || api === void 0 || (_api$core = api.core) === null || _api$core === void 0 || _api$core.actions.execute(function (_ref2) {
+        var tr = _ref2.tr;
+        return tr.setMeta(syncedBlockPluginKey, {
+          bodiedSyncBlockDeletionStatus: confirm ? 'processing' : 'none',
+          activeFlag: false
+        });
+      });
     };
-  }, []);
+  }, [api === null || api === void 0 || (_api$core2 = api.core) === null || _api$core2 === void 0 ? void 0 : _api$core2.actions]);
   var confirmationCallback = useCallback(function (syncBlockCount) {
     setIsOpen(true);
     setSyncBlockCount(syncBlockCount);
     var confirmedPromise = new Promise(function (resolve) {
       resolverRef.current = resolve;
     });
+    if (activeFlag) {
+      var _api$core3;
+      api === null || api === void 0 || (_api$core3 = api.core) === null || _api$core3 === void 0 || _api$core3.actions.execute(function (_ref3) {
+        var tr = _ref3.tr;
+        return tr.setMeta(syncedBlockPluginKey, {
+          // Clear flag to avoid potential retry deletion of different blocks
+          activeFlag: false
+        });
+      });
+    }
     return confirmedPromise;
-  }, []);
+  }, [activeFlag, api === null || api === void 0 || (_api$core4 = api.core) === null || _api$core4 === void 0 ? void 0 : _api$core4.actions]);
   useEffect(function () {
     var unregister = syncBlockStoreManager.sourceManager.registerConfirmationCallback(confirmationCallback);
     return function () {
       unregister();
     };
   }, [syncBlockStoreManager, confirmationCallback]);
+  useEffect(function () {
+    if (bodiedSyncBlockDeletionStatus === 'completed' && isOpen) {
+      var _api$core5;
+      // auto close modal once deletion is successful
+      setIsOpen(false);
+      api === null || api === void 0 || (_api$core5 = api.core) === null || _api$core5 === void 0 || _api$core5.actions.execute(function (_ref4) {
+        var tr = _ref4.tr;
+        return tr.setMeta(syncedBlockPluginKey, {
+          // Reset deletion status to have a clean state for next deletion
+          bodiedSyncBlockDeletionStatus: 'none'
+        });
+      });
+    }
+  }, [api === null || api === void 0 || (_api$core6 = api.core) === null || _api$core6 === void 0 ? void 0 : _api$core6.actions, bodiedSyncBlockDeletionStatus, isOpen]);
   return /*#__PURE__*/React.createElement(ModalTransition, null, isOpen && /*#__PURE__*/React.createElement(ModalDialog, {
-    onClose: handleClose(false),
+    onClose: handleClick(false),
     testId: "sync-block-delete-confirmation"
   }, /*#__PURE__*/React.createElement(ModalHeader, {
     hasCloseButton: true
@@ -61,11 +101,12 @@ export var DeleteConfirmationModal = function DeleteConfirmationModal(_ref) {
     syncBlockCount: syncBlockCount
   }))), /*#__PURE__*/React.createElement(ModalFooter, null, /*#__PURE__*/React.createElement(Button, {
     appearance: "subtle",
-    onClick: handleClose(false)
+    onClick: handleClick(false)
   }, formatMessage(messages.deleteConfirmationModalCancelButton)), /*#__PURE__*/React.createElement(Button, {
     appearance: "warning",
-    onClick: handleClose(true),
+    onClick: handleClick(true),
     autoFocus: true,
-    isDisabled: mode === 'offline'
+    isDisabled: mode === 'offline',
+    isLoading: bodiedSyncBlockDeletionStatus === 'processing'
   }, formatMessage(messages.deleteConfirmationModalDeleteButton)))));
 };

package/dist/esm/ui/Flag.js

@@ -1,13 +1,15 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
+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) { _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 { useIntl } from 'react-intl-next';
 import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
 import { syncBlockMessages as messages } from '@atlaskit/editor-common/messages';
 import AkFlag, { FlagGroup } from '@atlaskit/flag';
-import StatusErrorIcon from '@atlaskit/icon/core/status-error';
+import StatusWarningIcon from '@atlaskit/icon/core/status-warning';
 import { syncedBlockPluginKey } from '../pm-plugins/main';
 import { FLAG_ID } from '../types';
-var flagMap = _defineProperty(_defineProperty(_defineProperty({}, FLAG_ID.CANNOT_DELETE_WHEN_OFFLINE, {
+var flagMap = _defineProperty(_defineProperty(_defineProperty(_defineProperty({}, FLAG_ID.CANNOT_DELETE_WHEN_OFFLINE, {
   title: messages.failToDeleteTitle,
   description: messages.failToDeleteWhenOfflineDescription
 }), FLAG_ID.CANNOT_EDIT_WHEN_OFFLINE, {
@@ -16,43 +18,68 @@ var flagMap = _defineProperty(_defineProperty(_defineProperty({}, FLAG_ID.CANNOT
 }), FLAG_ID.CANNOT_CREATE_WHEN_OFFLINE, {
   title: messages.failToCreateTitle,
   description: messages.failToCreateWhenOfflineDescription
+}), FLAG_ID.FAIL_TO_DELETE, {
+  title: messages.cannotDeleteTitle,
+  description: messages.cannotDeleteDescription
 });
 export var Flag = function Flag(_ref) {
   var api = _ref.api;
-  var _useSharedPluginState = useSharedPluginStateWithSelector(api, ['syncedBlock'], function (states) {
-      var _states$syncedBlockSt;
+  var _useSharedPluginState = useSharedPluginStateWithSelector(api, ['syncedBlock', 'connectivity'], function (states) {
+      var _states$syncedBlockSt, _states$connectivityS;
       return {
-        showFlag: (_states$syncedBlockSt = states.syncedBlockState) === null || _states$syncedBlockSt === void 0 ? void 0 : _states$syncedBlockSt.showFlag
+        activeFlag: (_states$syncedBlockSt = states.syncedBlockState) === null || _states$syncedBlockSt === void 0 ? void 0 : _states$syncedBlockSt.activeFlag,
+        mode: (_states$connectivityS = states.connectivityState) === null || _states$connectivityS === void 0 ? void 0 : _states$connectivityS.mode
       };
     }),
-    showFlag = _useSharedPluginState.showFlag;
+    activeFlag = _useSharedPluginState.activeFlag,
+    mode = _useSharedPluginState.mode;
   var _useIntl = useIntl(),
     formatMessage = _useIntl.formatMessage;
-  if (!showFlag) {
+  if (!activeFlag) {
     return;
   }
-  var _flagMap$showFlag = flagMap[showFlag],
-    title = _flagMap$showFlag.title,
-    description = _flagMap$showFlag.description;
-  var onDismissed = function onDismissed() {
+  var _flagMap$activeFlag$i = flagMap[activeFlag.id],
+    title = _flagMap$activeFlag$i.title,
+    description = _flagMap$activeFlag$i.description;
+  var onRetry = activeFlag.onRetry,
+    onDismissedCallback = activeFlag.onDismissed;
+
+  // Retry button often involves network request, hence we dismiss the flag in offline mode to avoid retry
+  if (mode === 'offline' && !!onRetry) {
     api === null || api === void 0 || api.core.actions.execute(function (_ref2) {
       var tr = _ref2.tr;
       tr.setMeta(syncedBlockPluginKey, {
-        showFlag: false
+        activeFlag: false
       });
       return tr;
     });
+    return;
+  }
+  var onDismissed = function onDismissed() {
+    api === null || api === void 0 || api.core.actions.execute(function (_ref3) {
+      var tr = _ref3.tr;
+      onDismissedCallback === null || onDismissedCallback === void 0 || onDismissedCallback(tr);
+      var oldMeta = tr.getMeta(syncedBlockPluginKey);
+      tr.setMeta(syncedBlockPluginKey, _objectSpread(_objectSpread({}, oldMeta), {}, {
+        activeFlag: false
+      }));
+      return tr;
+    });
     api === null || api === void 0 || api.core.actions.focus();
   };
   return /*#__PURE__*/React.createElement(FlagGroup, null, /*#__PURE__*/React.createElement(AkFlag, {
     onDismissed: onDismissed,
     title: formatMessage(title),
     description: formatMessage(description),
-    id: showFlag,
-    testId: showFlag,
-    icon: /*#__PURE__*/React.createElement(StatusErrorIcon, {
+    id: activeFlag.id,
+    testId: activeFlag.id,
+    icon: /*#__PURE__*/React.createElement(StatusWarningIcon, {
       label: "",
-      color: "var(--ds-icon-danger, #C9372C)"
-    })
+      color: "var(--ds-icon-warning, #E06C00)"
+    }),
+    actions: onRetry ? [{
+      content: formatMessage(messages.deleteRetryButton),
+      onClick: onRetry
+    }] : undefined
   }));
 };

package/dist/esm/ui/SyncBlockRendererWrapper.js

@@ -6,14 +6,16 @@ var SyncBlockRendererWrapperComponent = function SyncBlockRendererWrapperCompone
   var syncedBlockRenderer = _ref.syncedBlockRenderer,
     useFetchSyncBlockData = _ref.useFetchSyncBlockData,
     localId = _ref.localId,
-    useFetchSyncBlockTitle = _ref.useFetchSyncBlockTitle;
+    useFetchSyncBlockTitle = _ref.useFetchSyncBlockTitle,
+    api = _ref.api;
   return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", {
     "data-testid": SyncBlockRendererWrapperDataId
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop
     ,
     className: SyncBlockSharedCssClassName.renderer
   }, syncedBlockRenderer({
-    useFetchSyncBlockData: useFetchSyncBlockData
+    useFetchSyncBlockData: useFetchSyncBlockData,
+    api: api
   })), /*#__PURE__*/React.createElement(SyncBlockLabel, {
     isSource: false,
     useFetchSyncBlockTitle: useFetchSyncBlockTitle,

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

@@ -4,11 +4,12 @@ import { PluginKey } from '@atlaskit/editor-prosemirror/state';
 import { DecorationSet } from '@atlaskit/editor-prosemirror/view';
 import { type SyncBlockStoreManager } from '@atlaskit/editor-synced-block-provider';
 import type { SyncedBlockPlugin, SyncedBlockPluginOptions } from '../syncedBlockPluginType';
-import { FLAG_ID } from '../types';
+import { type ActiveFlag, type BodiedSyncBlockDeletionStatus } from '../types';
 export declare const syncedBlockPluginKey: PluginKey<any>;
 type SyncedBlockPluginState = {
+    activeFlag: ActiveFlag;
+    bodiedSyncBlockDeletionStatus?: BodiedSyncBlockDeletionStatus;
     selectionDecorationSet: DecorationSet;
-    showFlag: FLAG_ID | false;
     syncBlockStore: SyncBlockStoreManager;
 };
 export declare const createPlugin: (options: SyncedBlockPluginOptions | undefined, pmPluginFactoryParams: PMPluginFactoryParams, syncBlockStore: SyncBlockStoreManager, api?: ExtractInjectionAPI<SyncedBlockPlugin>) => SafePlugin<SyncedBlockPluginState>;

package/dist/types/pm-plugins/utils/handle-bodied-sync-block-removal.d.ts

@@ -0,0 +1,9 @@
+import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
+import type { Transaction } from '@atlaskit/editor-prosemirror/state';
+import type { SyncBlockStoreManager } from '@atlaskit/editor-synced-block-provider';
+import type { SyncedBlockPlugin } from '../../syncedBlockPluginType';
+import { type SyncBlockInfo } from '../../types';
+export type ConfirmationTransactionRef = {
+    current: Transaction | undefined;
+};
+export declare const handleBodiedSyncBlockRemoval: (tr: Transaction, bodiedSyncBlockRemoved: SyncBlockInfo[], syncBlockStore: SyncBlockStoreManager, api: ExtractInjectionAPI<SyncedBlockPlugin> | undefined, confirmationTransactionRef: ConfirmationTransactionRef) => boolean;

package/dist/types/pm-plugins/utils/track-sync-blocks.d.ts

@@ -1,17 +1,8 @@
 import type { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
 import type { EditorState, Transaction } from '@atlaskit/editor-prosemirror/state';
-import type { SyncBlockAttrs } from '../../syncedBlockPluginType';
 export declare const trackSyncBlocks: (predicate: (node: PMNode) => boolean, tr: Transaction, state: EditorState) => {
-    removed: {
-        attrs: SyncBlockAttrs;
-        from?: number;
-        to?: number;
-    }[];
-    added: {
-        attrs: SyncBlockAttrs;
-        from?: number;
-        to?: number;
-    }[];
+    removed: import("../../types").SyncBlockInfo[];
+    added: import("../../types").SyncBlockInfo[];
 };
 /**
  *

package/dist/types/syncedBlockPluginType.d.ts

@@ -1,5 +1,5 @@
 import type { EventDispatcher } from '@atlaskit/editor-common/event-dispatcher';
-import type { EditorCommand, LongPressSelectionPluginOptions, NextEditorPlugin, OptionalPlugin } from '@atlaskit/editor-common/types';
+import type { EditorCommand, ExtractInjectionAPI, LongPressSelectionPluginOptions, NextEditorPlugin, OptionalPlugin } from '@atlaskit/editor-common/types';
 import type { JSONDocNode } from '@atlaskit/editor-json-transformer';
 import type { AnalyticsPlugin } from '@atlaskit/editor-plugin-analytics';
 import type { BlockControlsPlugin } from '@atlaskit/editor-plugin-block-controls';
@@ -36,6 +36,7 @@ export type SyncedBlockEditorProps = {
     popupsMountPoint: HTMLElement;
 };
 export type SyncedBlockRendererProps = {
+    api?: ExtractInjectionAPI<SyncedBlockPlugin>;
     useFetchSyncBlockData: () => UseFetchSyncBlockDataResult;
 };
 export interface SyncedBlockPluginOptions extends LongPressSelectionPluginOptions {
@@ -71,7 +72,3 @@ export type SyncedBlockPlugin = NextEditorPlugin<'syncedBlock', {
     pluginConfiguration: SyncedBlockPluginOptions | undefined;
     sharedState: SyncedBlockSharedState | undefined;
 }>;
-export type SyncBlockAttrs = {
-    localId: string;
-    resourceId: string;
-};

package/dist/types/types/index.d.ts

@@ -1,16 +1,42 @@
+import type { Transaction } from '@atlaskit/editor-prosemirror/state';
 import type { SyncBlockStoreManager } from '@atlaskit/editor-synced-block-provider';
 export declare enum FLAG_ID {
     CANNOT_DELETE_WHEN_OFFLINE = "cannot-delete-when-offline",
     CANNOT_EDIT_WHEN_OFFLINE = "cannot-edit-when-offline",
-    CANNOT_CREATE_WHEN_OFFLINE = "cannot-create-when-offline"
+    CANNOT_CREATE_WHEN_OFFLINE = "cannot-create-when-offline",
+    FAIL_TO_DELETE = "fail-to-delete"
 }
+type FlagConfig = {
+    id: FLAG_ID;
+    onDismissed?: (tr: Transaction) => Transaction | void;
+    onRetry?: () => void;
+};
+export type BodiedSyncBlockDeletionStatus = 'none' | 'processing' | 'completed';
+export type ActiveFlag = FlagConfig | false;
 export type SyncedBlockSharedState = {
     /**
      * Whether to show a flag (usually for errors, e.g. fail to delete)
      */
-    showFlag: FLAG_ID | false;
+    activeFlag: ActiveFlag;
+    /**
+     * Whether the plugin is currently saving bodiedSyncBlock deletion to backend
+     */
+    bodiedSyncBlockDeletionStatus?: BodiedSyncBlockDeletionStatus;
     /**
      * The current sync block store manager, used to manage fetching and updating sync block data
      */
     syncBlockStore: SyncBlockStoreManager;
 };
+export type SyncBlockAttrs = {
+    localId: string;
+    resourceId: string;
+};
+export type SyncBlockInfo = {
+    attrs: SyncBlockAttrs;
+    from?: number;
+    to?: number;
+};
+export type SyncBlockMap = {
+    [key: string]: SyncBlockInfo;
+};
+export {};

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

@@ -4,5 +4,5 @@ import type { SyncedBlockPlugin } from '../syncedBlockPluginType';
 type CreateSyncedBlockButtonProps = {
     api?: ExtractInjectionAPI<SyncedBlockPlugin>;
 };
-export declare const CreateSyncedBlockButton: ({ api }: CreateSyncedBlockButtonProps) => React.JSX.Element;
+export declare const CreateSyncedBlockButton: ({ api, }: CreateSyncedBlockButtonProps) => React.JSX.Element;
 export {};

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

@@ -2,5 +2,5 @@ import React from 'react';
 type OverflowMenuSectionProps = {
     children: React.ReactNode;
 };
-export declare const OverflowMenuSection: ({ children }: OverflowMenuSectionProps) => React.JSX.Element | null;
+export declare const OverflowMenuSection: ({ children, }: OverflowMenuSectionProps) => React.JSX.Element | null;
 export {};