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

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/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

@@ -71,7 +71,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 {};

package/dist/types-ts4.5/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-ts4.5/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-ts4.5/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-ts4.5/syncedBlockPluginType.d.ts

@@ -71,7 +71,3 @@ export type SyncedBlockPlugin = NextEditorPlugin<'syncedBlock', {
     pluginConfiguration: SyncedBlockPluginOptions | undefined;
     sharedState: SyncedBlockSharedState | undefined;
 }>;
-export type SyncBlockAttrs = {
-    localId: string;
-    resourceId: string;
-};

package/dist/types-ts4.5/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-ts4.5/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-ts4.5/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 {};

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-synced-block",
-	"version": "4.4.0",
+	"version": "4.4.1",
 	"description": "SyncedBlock plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -29,25 +29,25 @@
 	"atlaskit:src": "src/index.ts",
 	"dependencies": {
 		"@atlaskit/adf-schema": "^51.5.1",
-		"@atlaskit/button": "23.6.4",
+		"@atlaskit/button": "23.7.0",
 		"@atlaskit/editor-json-transformer": "^8.31.0",
 		"@atlaskit/editor-plugin-analytics": "^6.2.0",
-		"@atlaskit/editor-plugin-block-menu": "^5.1.0",
+		"@atlaskit/editor-plugin-block-menu": "^5.2.0",
 		"@atlaskit/editor-plugin-connectivity": "6.0.0",
 		"@atlaskit/editor-plugin-decorations": "^6.1.0",
 		"@atlaskit/editor-plugin-floating-toolbar": "^8.2.0",
 		"@atlaskit/editor-plugin-selection": "^6.1.0",
 		"@atlaskit/editor-prosemirror": "7.0.0",
 		"@atlaskit/editor-shared-styles": "^3.10.0",
-		"@atlaskit/editor-synced-block-provider": "^2.13.0",
+		"@atlaskit/editor-synced-block-provider": "^2.14.0",
 		"@atlaskit/editor-tables": "^2.9.0",
 		"@atlaskit/editor-toolbar": "^0.18.0",
-		"@atlaskit/flag": "^17.5.0",
+		"@atlaskit/flag": "^17.6.0",
 		"@atlaskit/icon": "29.0.2",
 		"@atlaskit/icon-lab": "^5.12.0",
 		"@atlaskit/logo": "^19.9.0",
 		"@atlaskit/lozenge": "^13.1.0",
-		"@atlaskit/modal-dialog": "^14.7.0",
+		"@atlaskit/modal-dialog": "^14.8.0",
 		"@atlaskit/primitives": "^16.4.0",
 		"@atlaskit/tokens": "8.4.1",
 		"@atlaskit/tooltip": "^20.11.0",
@@ -56,7 +56,7 @@
 		"react-intl-next": "npm:react-intl@^5.18.1"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^110.40.0",
+		"@atlaskit/editor-common": "^110.41.0",
 		"react": "^18.2.0"
 	},
 	"devDependencies": {