@atlaskit/editor-plugin-synced-block 3.8.1 → 3.8.2

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @atlaskit/editor-plugin-synced-block
 
+## 3.8.2
+
+### Patch Changes
+
+- [`62d0954696c7e`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/62d0954696c7e) -
+  [ux] EDITOR-1648 handle permission denied, not found and any generic error for sync block
+- Updated dependencies
+
 ## 3.8.1
 
 ### Patch Changes

package/dist/cjs/nodeviews/syncedBlock.js

@@ -19,17 +19,6 @@ var _SyncBlockRendererWrapper = require("../ui/SyncBlockRendererWrapper");
 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)); }
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
 function _superPropGet(t, o, e, r) { var p = (0, _get2.default)((0, _getPrototypeOf2.default)(1 & r ? t.prototype : t), o, e); return 2 & r && "function" == typeof p ? function (t) { return p.apply(e, t); } : p; }
-var defaultSyncBlockRendererDocument = {
-  version: 1,
-  type: 'doc',
-  content: [{
-    type: 'paragraph',
-    content: [{
-      type: 'text',
-      text: 'This is a reference sync block. Stay tuned for updates...'
-    }]
-  }]
-};
 var SyncBlock = /*#__PURE__*/function (_ReactNodeView) {
   function SyncBlock(props) {
     var _this;
@@ -60,8 +49,8 @@ var SyncBlock = /*#__PURE__*/function (_ReactNodeView) {
       // get document node from data provider
 
       return /*#__PURE__*/_react.default.createElement(_SyncBlockRendererWrapper.SyncBlockRendererWrapper, {
-        useFetchDocNode: function useFetchDocNode() {
-          return (0, _editorSyncedBlockProvider.useFetchDocNode)(_this2.syncBlockStore, _this2.node, defaultSyncBlockRendererDocument);
+        useFetchSyncBlockData: function useFetchSyncBlockData() {
+          return (0, _editorSyncedBlockProvider.useFetchSyncBlockData)(_this2.syncBlockStore, _this2.node);
         },
         getSyncedBlockRenderer: (_this$options2 = this.options) === null || _this$options2 === void 0 ? void 0 : _this$options2.getSyncedBlockRenderer
       });

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

@@ -8,7 +8,8 @@ exports.removeSyncedBlock = exports.editSyncedBlockSource = exports.createSynced
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _analytics = require("@atlaskit/editor-common/analytics");
 var _copyButton = require("@atlaskit/editor-common/copy-button");
-var _utils = require("./utils/utils");
+var _utils = require("@atlaskit/editor-prosemirror/utils");
+var _utils2 = require("./utils/utils");
 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) { (0, _defineProperty2.default)(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; }
 var createSyncedBlock = exports.createSyncedBlock = function createSyncedBlock(_ref) {
@@ -33,7 +34,7 @@ var createSyncedBlock = exports.createSyncedBlock = function createSyncedBlock(_
       tr = tr.replaceSelectionWith(newBodiedSyncBlockNode).scrollIntoView();
     }
   } else {
-    var conversionInfo = (0, _utils.canBeConvertedToSyncBlock)(tr.selection);
+    var conversionInfo = (0, _utils2.canBeConvertedToSyncBlock)(tr.selection);
     if (!conversionInfo) {
       // TODO: EDITOR-1665 - Raise an error analytics event
       return false;
@@ -53,11 +54,11 @@ var copySyncedBlockReferenceToClipboard = exports.copySyncedBlockReferenceToClip
     if (!(api !== null && api !== void 0 && api.floatingToolbar)) {
       return false;
     }
-    var syncBlockFindResult = (0, _utils.findSyncBlockOrBodiedSyncBlock)(state);
+    var syncBlockFindResult = (0, _utils2.findSyncBlockOrBodiedSyncBlock)(state);
     if (!syncBlockFindResult) {
       return false;
     }
-    var isBodiedSyncBlock = (0, _utils.isBodiedSyncBlockNode)(syncBlockFindResult.node, state.schema.nodes.bodiedSyncBlock);
+    var isBodiedSyncBlock = (0, _utils2.isBodiedSyncBlockNode)(syncBlockFindResult.node, state.schema.nodes.bodiedSyncBlock);
     var referenceSyncBlockNode = null;
     if (isBodiedSyncBlock) {
       var syncBlock = state.tr.doc.type.schema.nodes.syncBlock;
@@ -83,7 +84,7 @@ var copySyncedBlockReferenceToClipboard = exports.copySyncedBlockReferenceToClip
 var editSyncedBlockSource = exports.editSyncedBlockSource = function editSyncedBlockSource(syncBlockStore, api) {
   return function (state, dispatch, _view) {
     var _syncBlock$node;
-    var syncBlock = (0, _utils.findSyncBlock)(state);
+    var syncBlock = (0, _utils2.findSyncBlock)(state);
     var localId = syncBlock === null || syncBlock === void 0 || (_syncBlock$node = syncBlock.node) === null || _syncBlock$node === void 0 || (_syncBlock$node = _syncBlock$node.attrs) === null || _syncBlock$node === void 0 ? void 0 : _syncBlock$node.localId;
     if (!localId) {
       return false;
@@ -110,16 +111,21 @@ var editSyncedBlockSource = exports.editSyncedBlockSource = function editSyncedB
 };
 var removeSyncedBlock = exports.removeSyncedBlock = function removeSyncedBlock(api) {
   return function (state, dispatch, _view) {
-    var tr = state.tr;
-    var syncBlockFindResult = (0, _utils.findSyncBlockOrBodiedSyncBlock)(state);
-    if (!syncBlockFindResult) {
+    var nodes = state.schema.nodes,
+      tr = state.tr;
+    if (!dispatch) {
       return false;
     }
-    var newTr = tr.deleteRange(syncBlockFindResult.pos, syncBlockFindResult.pos + syncBlockFindResult.node.nodeSize);
-    if (!newTr) {
+    var removeTr = tr;
+    if ((0, _utils.findSelectedNodeOfType)(nodes.syncBlock)(tr.selection) || (0, _utils.findSelectedNodeOfType)(nodes.bodiedSyncBlock)(tr.selection)) {
+      removeTr = (0, _utils.removeSelectedNode)(tr);
+    } else {
+      removeTr = (0, _utils.removeParentNodeOfType)(nodes.bodiedSyncBlock)(tr);
+    }
+    if (!removeTr) {
       return false;
     }
-    dispatch === null || dispatch === void 0 || dispatch(newTr);
+    dispatch(removeTr);
     api === null || api === void 0 || api.core.actions.focus();
     return true;
   };

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

@@ -9,14 +9,10 @@ var _state = require("@atlaskit/editor-prosemirror/state");
 var _bodiedLazySyncedBlock = require("../nodeviews/bodiedLazySyncedBlock");
 var _lazySyncedBlock = require("../nodeviews/lazySyncedBlock");
 var _trackSyncBlocks2 = require("./utils/track-sync-blocks");
-var _utils = require("./utils/utils");
 var syncedBlockPluginKey = exports.syncedBlockPluginKey = new _state.PluginKey('syncedBlockPlugin');
 
 // eslint-disable-next-line @typescript-eslint/no-empty-object-type
 
-function isInsideBodiedSyncBlock(state, selection) {
-  return (0, _utils.findBodiedSyncBlock)(state, selection) !== undefined;
-}
 var createPlugin = exports.createPlugin = function createPlugin(options, pmPluginFactoryParams, syncBlockStore, api) {
   return new _safePlugin.SafePlugin({
     key: syncedBlockPluginKey,
@@ -46,17 +42,6 @@ var createPlugin = exports.createPlugin = function createPlugin(options, pmPlugi
           api: api,
           syncBlockStore: syncBlockStore
         })
-      },
-      handleKeyDown: function handleKeyDown(view, event) {
-        if (event.key === 'Enter' && isInsideBodiedSyncBlock(view.state, view.state.selection)) {
-          event.preventDefault();
-          // Insert a new paragraph instead of letting browser handle it
-          var tr = view.state.tr;
-          tr.split(view.state.selection.from);
-          view.dispatch(tr);
-          return true;
-        }
-        return false;
       }
     },
     view: function view(editorView) {

package/dist/cjs/ui/SyncBlockRendererWrapper.js

@@ -11,14 +11,14 @@ var _SyncBlockLabel = require("./SyncBlockLabel");
 var SyncBlockRendererWrapperDataId = 'sync-block-plugin-renderer-wrapper';
 var SyncBlockRendererWrapperComponent = function SyncBlockRendererWrapperComponent(_ref) {
   var getSyncedBlockRenderer = _ref.getSyncedBlockRenderer,
-    useFetchDocNode = _ref.useFetchDocNode;
+    useFetchSyncBlockData = _ref.useFetchSyncBlockData;
   return /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement(_SyncBlockLabel.SyncBlockLabel, null), /*#__PURE__*/_react.default.createElement("div", {
     "data-testid": SyncBlockRendererWrapperDataId
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop
     ,
     className: _syncBlock.SyncBlockSharedCssClassName.renderer
   }, getSyncedBlockRenderer({
-    useFetchDocNode: useFetchDocNode
+    useFetchSyncBlockData: useFetchSyncBlockData
   })));
 };
 var SyncBlockRendererWrapper = exports.SyncBlockRendererWrapper = /*#__PURE__*/_react.default.memo(SyncBlockRendererWrapperComponent);

package/dist/es2019/nodeviews/syncedBlock.js

@@ -1,19 +1,8 @@
 import React from 'react';
 import ReactNodeView from '@atlaskit/editor-common/react-node-view';
 import { SyncBlockSharedCssClassName } from '@atlaskit/editor-common/sync-block';
-import { useFetchDocNode } from '@atlaskit/editor-synced-block-provider';
+import { useFetchSyncBlockData } from '@atlaskit/editor-synced-block-provider';
 import { SyncBlockRendererWrapper } from '../ui/SyncBlockRendererWrapper';
-const defaultSyncBlockRendererDocument = {
-  version: 1,
-  type: 'doc',
-  content: [{
-    type: 'paragraph',
-    content: [{
-      type: 'text',
-      text: 'This is a reference sync block. Stay tuned for updates...'
-    }]
-  }]
-};
 class SyncBlock extends ReactNodeView {
   constructor(props) {
     super(props.node, props.view, props.getPos, props.portalProviderAPI, props.eventDispatcher, props);
@@ -34,7 +23,7 @@ class SyncBlock extends ReactNodeView {
     // get document node from data provider
 
     return /*#__PURE__*/React.createElement(SyncBlockRendererWrapper, {
-      useFetchDocNode: () => useFetchDocNode(this.syncBlockStore, this.node, defaultSyncBlockRendererDocument),
+      useFetchSyncBlockData: () => useFetchSyncBlockData(this.syncBlockStore, this.node),
       getSyncedBlockRenderer: (_this$options2 = this.options) === null || _this$options2 === void 0 ? void 0 : _this$options2.getSyncedBlockRenderer
     });
   }

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

@@ -1,5 +1,6 @@
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
 import { copyDomNode, toDOM } from '@atlaskit/editor-common/copy-button';
+import { findSelectedNodeOfType, removeParentNodeOfType, removeSelectedNode } from '@atlaskit/editor-prosemirror/utils';
 import { canBeConvertedToSyncBlock, findSyncBlock, findSyncBlockOrBodiedSyncBlock, isBodiedSyncBlockNode } from './utils/utils';
 export const createSyncedBlock = ({
   tr,
@@ -111,16 +112,25 @@ export const editSyncedBlockSource = (syncBlockStore, api) => (state, dispatch,
   return true;
 };
 export const removeSyncedBlock = api => (state, dispatch, _view) => {
-  const tr = state.tr;
-  const syncBlockFindResult = findSyncBlockOrBodiedSyncBlock(state);
-  if (!syncBlockFindResult) {
+  const {
+    schema: {
+      nodes
+    },
+    tr
+  } = state;
+  if (!dispatch) {
     return false;
   }
-  const newTr = tr.deleteRange(syncBlockFindResult.pos, syncBlockFindResult.pos + syncBlockFindResult.node.nodeSize);
-  if (!newTr) {
+  let removeTr = tr;
+  if (findSelectedNodeOfType(nodes.syncBlock)(tr.selection) || findSelectedNodeOfType(nodes.bodiedSyncBlock)(tr.selection)) {
+    removeTr = removeSelectedNode(tr);
+  } else {
+    removeTr = removeParentNodeOfType(nodes.bodiedSyncBlock)(tr);
+  }
+  if (!removeTr) {
     return false;
   }
-  dispatch === null || dispatch === void 0 ? void 0 : dispatch(newTr);
+  dispatch(removeTr);
   api === null || api === void 0 ? void 0 : api.core.actions.focus();
   return true;
 };

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

@@ -3,14 +3,10 @@ import { PluginKey } from '@atlaskit/editor-prosemirror/state';
 import { lazyBodiedSyncBlockView } from '../nodeviews/bodiedLazySyncedBlock';
 import { lazySyncBlockView } from '../nodeviews/lazySyncedBlock';
 import { trackSyncBlocks } from './utils/track-sync-blocks';
-import { findBodiedSyncBlock } from './utils/utils';
 export const syncedBlockPluginKey = new PluginKey('syncedBlockPlugin');
 
 // eslint-disable-next-line @typescript-eslint/no-empty-object-type
 
-function isInsideBodiedSyncBlock(state, selection) {
-  return findBodiedSyncBlock(state, selection) !== undefined;
-}
 export const createPlugin = (options, pmPluginFactoryParams, syncBlockStore, api) => {
   return new SafePlugin({
     key: syncedBlockPluginKey,
@@ -40,17 +36,6 @@ export const createPlugin = (options, pmPluginFactoryParams, syncBlockStore, api
           api,
           syncBlockStore
         })
-      },
-      handleKeyDown: (view, event) => {
-        if (event.key === 'Enter' && isInsideBodiedSyncBlock(view.state, view.state.selection)) {
-          event.preventDefault();
-          // Insert a new paragraph instead of letting browser handle it
-          const tr = view.state.tr;
-          tr.split(view.state.selection.from);
-          view.dispatch(tr);
-          return true;
-        }
-        return false;
       }
     },
     view: editorView => {

package/dist/es2019/ui/SyncBlockRendererWrapper.js

@@ -4,7 +4,7 @@ import { SyncBlockLabel } from './SyncBlockLabel';
 const SyncBlockRendererWrapperDataId = 'sync-block-plugin-renderer-wrapper';
 const SyncBlockRendererWrapperComponent = ({
   getSyncedBlockRenderer,
-  useFetchDocNode
+  useFetchSyncBlockData
 }) => {
   return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(SyncBlockLabel, null), /*#__PURE__*/React.createElement("div", {
     "data-testid": SyncBlockRendererWrapperDataId
@@ -12,7 +12,7 @@ const SyncBlockRendererWrapperComponent = ({
     ,
     className: SyncBlockSharedCssClassName.renderer
   }, getSyncedBlockRenderer({
-    useFetchDocNode
+    useFetchSyncBlockData
   })));
 };
 export const SyncBlockRendererWrapper = /*#__PURE__*/React.memo(SyncBlockRendererWrapperComponent);

package/dist/esm/nodeviews/syncedBlock.js

@@ -10,19 +10,8 @@ function _superPropGet(t, o, e, r) { var p = _get(_getPrototypeOf(1 & r ? t.prot
 import React from 'react';
 import ReactNodeView from '@atlaskit/editor-common/react-node-view';
 import { SyncBlockSharedCssClassName } from '@atlaskit/editor-common/sync-block';
-import { useFetchDocNode as _useFetchDocNode } from '@atlaskit/editor-synced-block-provider';
+import { useFetchSyncBlockData as _useFetchSyncBlockData } from '@atlaskit/editor-synced-block-provider';
 import { SyncBlockRendererWrapper } from '../ui/SyncBlockRendererWrapper';
-var defaultSyncBlockRendererDocument = {
-  version: 1,
-  type: 'doc',
-  content: [{
-    type: 'paragraph',
-    content: [{
-      type: 'text',
-      text: 'This is a reference sync block. Stay tuned for updates...'
-    }]
-  }]
-};
 var SyncBlock = /*#__PURE__*/function (_ReactNodeView) {
   function SyncBlock(props) {
     var _this;
@@ -53,8 +42,8 @@ var SyncBlock = /*#__PURE__*/function (_ReactNodeView) {
       // get document node from data provider
 
       return /*#__PURE__*/React.createElement(SyncBlockRendererWrapper, {
-        useFetchDocNode: function useFetchDocNode() {
-          return _useFetchDocNode(_this2.syncBlockStore, _this2.node, defaultSyncBlockRendererDocument);
+        useFetchSyncBlockData: function useFetchSyncBlockData() {
+          return _useFetchSyncBlockData(_this2.syncBlockStore, _this2.node);
         },
         getSyncedBlockRenderer: (_this$options2 = this.options) === null || _this$options2 === void 0 ? void 0 : _this$options2.getSyncedBlockRenderer
       });

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

@@ -3,6 +3,7 @@ function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbol
 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 { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
 import { copyDomNode, toDOM } from '@atlaskit/editor-common/copy-button';
+import { findSelectedNodeOfType, removeParentNodeOfType, removeSelectedNode } from '@atlaskit/editor-prosemirror/utils';
 import { canBeConvertedToSyncBlock, findSyncBlock, findSyncBlockOrBodiedSyncBlock, isBodiedSyncBlockNode } from './utils/utils';
 export var createSyncedBlock = function createSyncedBlock(_ref) {
   var tr = _ref.tr,
@@ -103,16 +104,21 @@ export var editSyncedBlockSource = function editSyncedBlockSource(syncBlockStore
 };
 export var removeSyncedBlock = function removeSyncedBlock(api) {
   return function (state, dispatch, _view) {
-    var tr = state.tr;
-    var syncBlockFindResult = findSyncBlockOrBodiedSyncBlock(state);
-    if (!syncBlockFindResult) {
+    var nodes = state.schema.nodes,
+      tr = state.tr;
+    if (!dispatch) {
       return false;
     }
-    var newTr = tr.deleteRange(syncBlockFindResult.pos, syncBlockFindResult.pos + syncBlockFindResult.node.nodeSize);
-    if (!newTr) {
+    var removeTr = tr;
+    if (findSelectedNodeOfType(nodes.syncBlock)(tr.selection) || findSelectedNodeOfType(nodes.bodiedSyncBlock)(tr.selection)) {
+      removeTr = removeSelectedNode(tr);
+    } else {
+      removeTr = removeParentNodeOfType(nodes.bodiedSyncBlock)(tr);
+    }
+    if (!removeTr) {
       return false;
     }
-    dispatch === null || dispatch === void 0 || dispatch(newTr);
+    dispatch(removeTr);
     api === null || api === void 0 || api.core.actions.focus();
     return true;
   };

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

@@ -3,14 +3,10 @@ import { PluginKey } from '@atlaskit/editor-prosemirror/state';
 import { lazyBodiedSyncBlockView } from '../nodeviews/bodiedLazySyncedBlock';
 import { lazySyncBlockView } from '../nodeviews/lazySyncedBlock';
 import { trackSyncBlocks } from './utils/track-sync-blocks';
-import { findBodiedSyncBlock } from './utils/utils';
 export var syncedBlockPluginKey = new PluginKey('syncedBlockPlugin');
 
 // eslint-disable-next-line @typescript-eslint/no-empty-object-type
 
-function isInsideBodiedSyncBlock(state, selection) {
-  return findBodiedSyncBlock(state, selection) !== undefined;
-}
 export var createPlugin = function createPlugin(options, pmPluginFactoryParams, syncBlockStore, api) {
   return new SafePlugin({
     key: syncedBlockPluginKey,
@@ -40,17 +36,6 @@ export var createPlugin = function createPlugin(options, pmPluginFactoryParams,
           api: api,
           syncBlockStore: syncBlockStore
         })
-      },
-      handleKeyDown: function handleKeyDown(view, event) {
-        if (event.key === 'Enter' && isInsideBodiedSyncBlock(view.state, view.state.selection)) {
-          event.preventDefault();
-          // Insert a new paragraph instead of letting browser handle it
-          var tr = view.state.tr;
-          tr.split(view.state.selection.from);
-          view.dispatch(tr);
-          return true;
-        }
-        return false;
       }
     },
     view: function view(editorView) {

package/dist/esm/ui/SyncBlockRendererWrapper.js

@@ -4,14 +4,14 @@ import { SyncBlockLabel } from './SyncBlockLabel';
 var SyncBlockRendererWrapperDataId = 'sync-block-plugin-renderer-wrapper';
 var SyncBlockRendererWrapperComponent = function SyncBlockRendererWrapperComponent(_ref) {
   var getSyncedBlockRenderer = _ref.getSyncedBlockRenderer,
-    useFetchDocNode = _ref.useFetchDocNode;
+    useFetchSyncBlockData = _ref.useFetchSyncBlockData;
   return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(SyncBlockLabel, null), /*#__PURE__*/React.createElement("div", {
     "data-testid": SyncBlockRendererWrapperDataId
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop
     ,
     className: SyncBlockSharedCssClassName.renderer
   }, getSyncedBlockRenderer({
-    useFetchDocNode: useFetchDocNode
+    useFetchSyncBlockData: useFetchSyncBlockData
   })));
 };
 export var SyncBlockRendererWrapper = /*#__PURE__*/React.memo(SyncBlockRendererWrapperComponent);

package/dist/types/syncedBlockPluginType.d.ts

@@ -1,4 +1,3 @@
-import type { DocNode } from '@atlaskit/adf-schema';
 import type { EventDispatcher } from '@atlaskit/editor-common/event-dispatcher';
 import type { EditorCommand, NextEditorPlugin, OptionalPlugin } from '@atlaskit/editor-common/types';
 import type { JSONDocNode } from '@atlaskit/editor-json-transformer';
@@ -9,7 +8,7 @@ import type { DecorationsPlugin } from '@atlaskit/editor-plugin-decorations';
 import type { FloatingToolbarPlugin } from '@atlaskit/editor-plugin-floating-toolbar';
 import type { SelectionPlugin } from '@atlaskit/editor-plugin-selection';
 import type { EditorView } from '@atlaskit/editor-prosemirror/dist/types/view';
-import type { SyncBlockDataProvider } from '@atlaskit/editor-synced-block-provider';
+import type { FetchSyncBlockDataResult, SyncBlockDataProvider } from '@atlaskit/editor-synced-block-provider';
 export type SyncedBlockEditorProps = {
     defaultDocument: JSONDocNode;
     onChange: (editorView: EditorView, meta: {
@@ -33,7 +32,7 @@ export type SyncedBlockEditorProps = {
     popupsMountPoint: HTMLElement;
 };
 export type SyncedBlockRendererProps = {
-    useFetchDocNode: () => DocNode;
+    useFetchSyncBlockData: () => FetchSyncBlockDataResult | null;
 };
 export type SyncedBlockPluginOptions = {
     dataProvider?: SyncBlockDataProvider;

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

@@ -1,9 +1,9 @@
 import React from 'react';
-import type { DocNode } from '@atlaskit/adf-schema';
+import type { FetchSyncBlockDataResult } from '@atlaskit/editor-synced-block-provider';
 import type { SyncedBlockRendererProps } from '../syncedBlockPluginType';
 type Props = {
     getSyncedBlockRenderer: (props: SyncedBlockRendererProps) => React.JSX.Element;
-    useFetchDocNode: () => DocNode;
+    useFetchSyncBlockData: () => FetchSyncBlockDataResult | null;
 };
-export declare const SyncBlockRendererWrapper: React.MemoExoticComponent<({ getSyncedBlockRenderer, useFetchDocNode }: Props) => React.JSX.Element>;
+export declare const SyncBlockRendererWrapper: React.MemoExoticComponent<({ getSyncedBlockRenderer, useFetchSyncBlockData, }: Props) => React.JSX.Element>;
 export {};

package/dist/types-ts4.5/syncedBlockPluginType.d.ts

@@ -1,4 +1,3 @@
-import type { DocNode } from '@atlaskit/adf-schema';
 import type { EventDispatcher } from '@atlaskit/editor-common/event-dispatcher';
 import type { EditorCommand, NextEditorPlugin, OptionalPlugin } from '@atlaskit/editor-common/types';
 import type { JSONDocNode } from '@atlaskit/editor-json-transformer';
@@ -9,7 +8,7 @@ import type { DecorationsPlugin } from '@atlaskit/editor-plugin-decorations';
 import type { FloatingToolbarPlugin } from '@atlaskit/editor-plugin-floating-toolbar';
 import type { SelectionPlugin } from '@atlaskit/editor-plugin-selection';
 import type { EditorView } from '@atlaskit/editor-prosemirror/dist/types/view';
-import type { SyncBlockDataProvider } from '@atlaskit/editor-synced-block-provider';
+import type { FetchSyncBlockDataResult, SyncBlockDataProvider } from '@atlaskit/editor-synced-block-provider';
 export type SyncedBlockEditorProps = {
     defaultDocument: JSONDocNode;
     onChange: (editorView: EditorView, meta: {
@@ -33,7 +32,7 @@ export type SyncedBlockEditorProps = {
     popupsMountPoint: HTMLElement;
 };
 export type SyncedBlockRendererProps = {
-    useFetchDocNode: () => DocNode;
+    useFetchSyncBlockData: () => FetchSyncBlockDataResult | null;
 };
 export type SyncedBlockPluginOptions = {
     dataProvider?: SyncBlockDataProvider;

package/dist/types-ts4.5/ui/SyncBlockRendererWrapper.d.ts

@@ -1,9 +1,9 @@
 import React from 'react';
-import type { DocNode } from '@atlaskit/adf-schema';
+import type { FetchSyncBlockDataResult } from '@atlaskit/editor-synced-block-provider';
 import type { SyncedBlockRendererProps } from '../syncedBlockPluginType';
 type Props = {
     getSyncedBlockRenderer: (props: SyncedBlockRendererProps) => React.JSX.Element;
-    useFetchDocNode: () => DocNode;
+    useFetchSyncBlockData: () => FetchSyncBlockDataResult | null;
 };
-export declare const SyncBlockRendererWrapper: React.MemoExoticComponent<({ getSyncedBlockRenderer, useFetchDocNode }: Props) => React.JSX.Element>;
+export declare const SyncBlockRendererWrapper: React.MemoExoticComponent<({ getSyncedBlockRenderer, useFetchSyncBlockData, }: Props) => React.JSX.Element>;
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-synced-block",
-	"version": "3.8.1",
+	"version": "3.8.2",
 	"description": "SyncedBlock plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -42,7 +42,7 @@
 		"@atlaskit/editor-tables": "^2.9.0",
 		"@atlaskit/editor-toolbar": "^0.16.0",
 		"@atlaskit/icon": "28.5.3",
-		"@atlaskit/modal-dialog": "^14.5.0",
+		"@atlaskit/modal-dialog": "^14.6.0",
 		"@babel/runtime": "^7.0.0",
 		"react-intl-next": "npm:react-intl@^5.18.1"
 	},

package/afm-dev-agents/tsconfig.json

@@ -1,68 +0,0 @@
-{
-	"extends": "../../../../tsconfig.entry-points.dev-agents.json",
-	"compilerOptions": {
-		"target": "es5",
-		"outDir": "../../../../../dev-agents/tsDist/@atlaskit__editor-plugin-synced-block/app",
-		"rootDir": "../",
-		"composite": true
-	},
-	"include": [
-		"../src/**/*.ts",
-		"../src/**/*.tsx"
-	],
-	"exclude": [
-		"../src/**/__tests__/*",
-		"../src/**/*.test.*",
-		"../src/**/test.*",
-		"../src/**/examples.*",
-		"../src/**/examples/*",
-		"../src/**/examples/**/*",
-		"../src/**/*.stories.*",
-		"../src/**/stories/*",
-		"../src/**/stories/**/*"
-	],
-	"references": [
-		{
-			"path": "../../../design-system/button/afm-dev-agents/tsconfig.json"
-		},
-		{
-			"path": "../../editor-json-transformer/afm-dev-agents/tsconfig.json"
-		},
-		{
-			"path": "../../editor-plugin-analytics/afm-dev-agents/tsconfig.json"
-		},
-		{
-			"path": "../../editor-plugin-block-menu/afm-dev-agents/tsconfig.json"
-		},
-		{
-			"path": "../../editor-plugin-decorations/afm-dev-agents/tsconfig.json"
-		},
-		{
-			"path": "../../editor-plugin-floating-toolbar/afm-dev-agents/tsconfig.json"
-		},
-		{
-			"path": "../../editor-plugin-selection/afm-dev-agents/tsconfig.json"
-		},
-		{
-			"path": "../../editor-shared-styles/afm-dev-agents/tsconfig.json"
-		},
-		{
-			"path": "../../editor-synced-block-provider/afm-dev-agents/tsconfig.json"
-		},
-		{
-			"path": "../../editor-tables/afm-dev-agents/tsconfig.json"
-		},
-		{
-			"path": "../../editor-toolbar/afm-dev-agents/tsconfig.json"
-		},
-		{
-			"path": "../../../design-system/icon/afm-dev-agents/tsconfig.json"
-		},
-		{
-			"path": "../../../design-system/modal-dialog/afm-dev-agents/tsconfig.json"
-		},
-		{
-			"path": "../../editor-common/afm-dev-agents/tsconfig.json"
-		}
-	]
-}

package/afm-passionfruit/tsconfig.json

@@ -1,68 +0,0 @@
-{
-	"extends": "../../../../tsconfig.entry-points.passionfruit.json",
-	"compilerOptions": {
-		"target": "es5",
-		"outDir": "../../../../../passionfruit/tsDist/@atlaskit__editor-plugin-synced-block/app",
-		"rootDir": "../",
-		"composite": true
-	},
-	"include": [
-		"../src/**/*.ts",
-		"../src/**/*.tsx"
-	],
-	"exclude": [
-		"../src/**/__tests__/*",
-		"../src/**/*.test.*",
-		"../src/**/test.*",
-		"../src/**/examples.*",
-		"../src/**/examples/*",
-		"../src/**/examples/**/*",
-		"../src/**/*.stories.*",
-		"../src/**/stories/*",
-		"../src/**/stories/**/*"
-	],
-	"references": [
-		{
-			"path": "../../../design-system/button/afm-passionfruit/tsconfig.json"
-		},
-		{
-			"path": "../../editor-json-transformer/afm-passionfruit/tsconfig.json"
-		},
-		{
-			"path": "../../editor-plugin-analytics/afm-passionfruit/tsconfig.json"
-		},
-		{
-			"path": "../../editor-plugin-block-menu/afm-passionfruit/tsconfig.json"
-		},
-		{
-			"path": "../../editor-plugin-decorations/afm-passionfruit/tsconfig.json"
-		},
-		{
-			"path": "../../editor-plugin-floating-toolbar/afm-passionfruit/tsconfig.json"
-		},
-		{
-			"path": "../../editor-plugin-selection/afm-passionfruit/tsconfig.json"
-		},
-		{
-			"path": "../../editor-shared-styles/afm-passionfruit/tsconfig.json"
-		},
-		{
-			"path": "../../editor-synced-block-provider/afm-passionfruit/tsconfig.json"
-		},
-		{
-			"path": "../../editor-tables/afm-passionfruit/tsconfig.json"
-		},
-		{
-			"path": "../../editor-toolbar/afm-passionfruit/tsconfig.json"
-		},
-		{
-			"path": "../../../design-system/icon/afm-passionfruit/tsconfig.json"
-		},
-		{
-			"path": "../../../design-system/modal-dialog/afm-passionfruit/tsconfig.json"
-		},
-		{
-			"path": "../../editor-common/afm-passionfruit/tsconfig.json"
-		}
-	]
-}

package/afm-rovo-extension/tsconfig.json

@@ -1,68 +0,0 @@
-{
-	"extends": "../../../../tsconfig.entry-points.rovo-extension.json",
-	"compilerOptions": {
-		"target": "es5",
-		"outDir": "../../../../../rovo-extension/tsDist/@atlaskit__editor-plugin-synced-block/app",
-		"rootDir": "../",
-		"composite": true
-	},
-	"include": [
-		"../src/**/*.ts",
-		"../src/**/*.tsx"
-	],
-	"exclude": [
-		"../src/**/__tests__/*",
-		"../src/**/*.test.*",
-		"../src/**/test.*",
-		"../src/**/examples.*",
-		"../src/**/examples/*",
-		"../src/**/examples/**/*",
-		"../src/**/*.stories.*",
-		"../src/**/stories/*",
-		"../src/**/stories/**/*"
-	],
-	"references": [
-		{
-			"path": "../../../design-system/button/afm-rovo-extension/tsconfig.json"
-		},
-		{
-			"path": "../../editor-json-transformer/afm-rovo-extension/tsconfig.json"
-		},
-		{
-			"path": "../../editor-plugin-analytics/afm-rovo-extension/tsconfig.json"
-		},
-		{
-			"path": "../../editor-plugin-block-menu/afm-rovo-extension/tsconfig.json"
-		},
-		{
-			"path": "../../editor-plugin-decorations/afm-rovo-extension/tsconfig.json"
-		},
-		{
-			"path": "../../editor-plugin-floating-toolbar/afm-rovo-extension/tsconfig.json"
-		},
-		{
-			"path": "../../editor-plugin-selection/afm-rovo-extension/tsconfig.json"
-		},
-		{
-			"path": "../../editor-shared-styles/afm-rovo-extension/tsconfig.json"
-		},
-		{
-			"path": "../../editor-synced-block-provider/afm-rovo-extension/tsconfig.json"
-		},
-		{
-			"path": "../../editor-tables/afm-rovo-extension/tsconfig.json"
-		},
-		{
-			"path": "../../editor-toolbar/afm-rovo-extension/tsconfig.json"
-		},
-		{
-			"path": "../../../design-system/icon/afm-rovo-extension/tsconfig.json"
-		},
-		{
-			"path": "../../../design-system/modal-dialog/afm-rovo-extension/tsconfig.json"
-		},
-		{
-			"path": "../../editor-common/afm-rovo-extension/tsconfig.json"
-		}
-	]
-}