@atlaskit/editor-plugin-synced-block 4.0.0 → 4.1.0

package/CHANGELOG.md

@@ -1,5 +1,24 @@
 # @atlaskit/editor-plugin-synced-block
 
+## 4.1.0
+
+### Minor Changes
+
+- [`261fa27c56fd0`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/261fa27c56fd0) -
+  EDITOR-2533 implement retry function for sync-block renderer
+
+### Patch Changes
+
+- Updated dependencies
+
+## 4.0.1
+
+### Patch Changes
+
+- [`7e3353721fa66`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/7e3353721fa66) -
+  [ux] EDITOR-1822 update sync blocks ui to new design
+- Updated dependencies
+
 ## 4.0.0
 
 ### Major Changes

package/afm-cc/tsconfig.json

@@ -58,9 +58,24 @@
 		{
 			"path": "../../../design-system/icon/afm-cc/tsconfig.json"
 		},
+		{
+			"path": "../../../design-system/logo/afm-cc/tsconfig.json"
+		},
+		{
+			"path": "../../../design-system/lozenge/afm-cc/tsconfig.json"
+		},
 		{
 			"path": "../../../design-system/modal-dialog/afm-cc/tsconfig.json"
 		},
+		{
+			"path": "../../../design-system/primitives/afm-cc/tsconfig.json"
+		},
+		{
+			"path": "../../../design-system/tooltip/afm-cc/tsconfig.json"
+		},
+		{
+			"path": "../../../design-system/visually-hidden/afm-cc/tsconfig.json"
+		},
 		{
 			"path": "../../editor-common/afm-cc/tsconfig.json"
 		}

package/afm-jira/tsconfig.json

@@ -58,9 +58,24 @@
 		{
 			"path": "../../../design-system/icon/afm-jira/tsconfig.json"
 		},
+		{
+			"path": "../../../design-system/logo/afm-jira/tsconfig.json"
+		},
+		{
+			"path": "../../../design-system/lozenge/afm-jira/tsconfig.json"
+		},
 		{
 			"path": "../../../design-system/modal-dialog/afm-jira/tsconfig.json"
 		},
+		{
+			"path": "../../../design-system/primitives/afm-jira/tsconfig.json"
+		},
+		{
+			"path": "../../../design-system/tooltip/afm-jira/tsconfig.json"
+		},
+		{
+			"path": "../../../design-system/visually-hidden/afm-jira/tsconfig.json"
+		},
 		{
 			"path": "../../editor-common/afm-jira/tsconfig.json"
 		}

package/afm-products/tsconfig.json

@@ -58,9 +58,24 @@
 		{
 			"path": "../../../design-system/icon/afm-products/tsconfig.json"
 		},
+		{
+			"path": "../../../design-system/logo/afm-products/tsconfig.json"
+		},
+		{
+			"path": "../../../design-system/lozenge/afm-products/tsconfig.json"
+		},
 		{
 			"path": "../../../design-system/modal-dialog/afm-products/tsconfig.json"
 		},
+		{
+			"path": "../../../design-system/primitives/afm-products/tsconfig.json"
+		},
+		{
+			"path": "../../../design-system/tooltip/afm-products/tsconfig.json"
+		},
+		{
+			"path": "../../../design-system/visually-hidden/afm-products/tsconfig.json"
+		},
 		{
 			"path": "../../editor-common/afm-products/tsconfig.json"
 		}

package/dist/cjs/nodeviews/syncedBlock.js

@@ -46,14 +46,23 @@ var SyncBlock = /*#__PURE__*/function (_ReactNodeView) {
       if (!((_this$options = this.options) !== null && _this$options !== void 0 && _this$options.getSyncedBlockRenderer)) {
         return null;
       }
+      var _this$node$attrs = this.node.attrs,
+        resourceId = _this$node$attrs.resourceId,
+        localId = _this$node$attrs.localId;
+      if (!resourceId || !localId) {
+        return null;
+      }
 
       // get document node from data provider
-
       return /*#__PURE__*/_react.default.createElement(_SyncBlockRendererWrapper.SyncBlockRendererWrapper, {
+        localId: this.node.attrs.localId,
         getSyncedBlockRenderer: (_this$options2 = this.options) === null || _this$options2 === void 0 ? void 0 : _this$options2.getSyncedBlockRenderer,
         syncBlockRendererDataProviders: (_this$options3 = this.options) === null || _this$options3 === void 0 ? void 0 : _this$options3.syncBlockRendererDataProviders,
+        useFetchSyncBlockTitle: function useFetchSyncBlockTitle() {
+          return (0, _editorSyncedBlockProvider.useFetchSyncBlockTitle)(_this2.syncBlockStore, _this2.node);
+        },
         useFetchSyncBlockData: function useFetchSyncBlockData() {
-          return (0, _editorSyncedBlockProvider.useFetchSyncBlockData)(_this2.syncBlockStore, _this2.node);
+          return (0, _editorSyncedBlockProvider.useFetchSyncBlockData)(_this2.syncBlockStore, resourceId, localId);
         }
       });
     }
@@ -61,9 +70,6 @@ var SyncBlock = /*#__PURE__*/function (_ReactNodeView) {
     key: "destroy",
     value: function destroy() {
       var _this$unsubscribe;
-      if (this.fetchIntervalId) {
-        window.clearInterval(this.fetchIntervalId);
-      }
       (_this$unsubscribe = this.unsubscribe) === null || _this$unsubscribe === void 0 || _this$unsubscribe.call(this);
       _superPropGet(SyncBlock, "destroy", this, 3)([]);
     }

package/dist/cjs/ui/BodiedSyncBlockWrapper.js

@@ -13,8 +13,11 @@ var BodiedSyncBlockWrapper = exports.BodiedSyncBlockWrapper = /*#__PURE__*/_reac
     syncBlockStore = _ref.syncBlockStore;
   // TODO: EDITOR-2429 - this should be debounced (either here or in the data provider) to avoid excessive API writes
   (0, _editorSyncedBlockProvider.useHandleContentChanges)(syncBlockStore, node);
-  return /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement(_SyncBlockLabel.SyncBlockLabel, null), /*#__PURE__*/_react.default.createElement("div", {
+  return /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement("div", {
     "data-testid": "bodied-sync-block-wrapper",
     ref: ref
+  }), /*#__PURE__*/_react.default.createElement(_SyncBlockLabel.SyncBlockLabel, {
+    isSource: true,
+    localId: node.attrs.localId
   }));
 });

package/dist/cjs/ui/CreateSyncedBlockDropdownItem.js

@@ -9,6 +9,8 @@ var _react = _interopRequireDefault(require("react"));
 var _reactIntlNext = require("react-intl-next");
 var _messages = require("@atlaskit/editor-common/messages");
 var _editorToolbar = require("@atlaskit/editor-toolbar");
+var _lozenge = _interopRequireDefault(require("@atlaskit/lozenge"));
+var _compiled = require("@atlaskit/primitives/compiled");
 var _utils = require("../pm-plugins/utils/utils");
 var CreateSyncedBlockDropdownItem = exports.CreateSyncedBlockDropdownItem = function CreateSyncedBlockDropdownItem(_ref) {
   var _api$selection;
@@ -42,5 +44,10 @@ var CreateSyncedBlockDropdownItem = exports.CreateSyncedBlockDropdownItem = func
       label: ""
     }),
     onClick: onClick
-  }, selection !== null && selection !== void 0 && selection.empty ? formatMessage(_messages.blockMenuMessages.createSyncedBlock) : formatMessage(_messages.blockMenuMessages.convertToSyncedBlock));
+  }, /*#__PURE__*/_react.default.createElement(_compiled.Flex, {
+    alignItems: "center",
+    gap: "space.050"
+  }, /*#__PURE__*/_react.default.createElement(_compiled.Text, null, selection !== null && selection !== void 0 && selection.empty ? formatMessage(_messages.blockMenuMessages.createSyncedBlock) : formatMessage(_messages.blockMenuMessages.convertToSyncedBlock)), /*#__PURE__*/_react.default.createElement(_lozenge.default, {
+    appearance: "new"
+  }, formatMessage(_messages.blockMenuMessages.newLozenge))));
 };

package/dist/cjs/ui/SyncBlockLabel.js

@@ -9,15 +9,47 @@ var _react = _interopRequireDefault(require("react"));
 var _reactIntlNext = require("react-intl-next");
 var _messages = require("@atlaskit/editor-common/messages");
 var _syncBlock = require("@atlaskit/editor-common/sync-block");
+var _logo = require("@atlaskit/logo");
+var _compiled = require("@atlaskit/primitives/compiled");
+var _tooltip = _interopRequireDefault(require("@atlaskit/tooltip"));
+var _visuallyHidden = _interopRequireDefault(require("@atlaskit/visually-hidden"));
 var SyncBlockLabelDataId = 'sync-block-label';
-var SyncBlockLabelComponent = function SyncBlockLabelComponent() {
+var SyncBlockLabelComponent = function SyncBlockLabelComponent(_ref) {
+  var isSource = _ref.isSource,
+    useFetchSyncBlockTitle = _ref.useFetchSyncBlockTitle,
+    localId = _ref.localId;
   var _useIntl = (0, _reactIntlNext.useIntl)(),
     formatMessage = _useIntl.formatMessage;
-  return /*#__PURE__*/_react.default.createElement("div", {
+  var title = useFetchSyncBlockTitle === null || useFetchSyncBlockTitle === void 0 ? void 0 : useFetchSyncBlockTitle();
+  var tooltipContent = isSource ? formatMessage(_messages.syncBlockMessages.sourceSyncBlockTooltip) : title ? formatMessage(_messages.syncBlockMessages.referenceSyncBlockTooltip, {
+    title: title
+  }) : formatMessage(_messages.syncBlockMessages.defaultSyncBlockTooltip);
+  var ariaDescribedById = "sync-block-label-description-".concat(localId);
+  return /*#__PURE__*/_react.default.createElement(_tooltip.default, {
+    position: "top",
+    content: tooltipContent
+    // workaround because tooltip adds aria-describedby with a new id every time the tooltip is opened
+    // this causes an infinite rerender loop because of the forwardRef from the node view we are inside in bodiedSyncBlock
+    // tooltip content is available for screen readers in visually hidden content after the label
+    ,
+    isScreenReaderAnnouncementDisabled: true
+  }, /*#__PURE__*/_react.default.createElement("div", {
     "data-testid": SyncBlockLabelDataId
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop
     ,
-    className: _syncBlock.SyncBlockLabelSharedCssClassName.labelClassName
-  }, formatMessage(_messages.syncBlockMessages.syncedBlockLabel));
+    className: _syncBlock.SyncBlockLabelSharedCssClassName.labelClassName,
+    "aria-describedby": ariaDescribedById
+  }, /*#__PURE__*/_react.default.createElement(_logo.ConfluenceIcon, {
+    size: "xsmall",
+    appearance: "neutral",
+    shouldUseNewLogoDesign: true
+  }), isSource || !title ? /*#__PURE__*/_react.default.createElement(_compiled.Text, {
+    size: "small"
+  }, formatMessage(_messages.syncBlockMessages.syncedBlockLabel)) : /*#__PURE__*/_react.default.createElement(_compiled.Text, {
+    maxLines: 1,
+    size: "small"
+  }, title)), /*#__PURE__*/_react.default.createElement(_visuallyHidden.default, {
+    id: ariaDescribedById
+  }, tooltipContent));
 };
 var SyncBlockLabel = exports.SyncBlockLabel = /*#__PURE__*/_react.default.memo(SyncBlockLabelComponent);

package/dist/cjs/ui/SyncBlockRefresher.js

@@ -3,9 +3,9 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.SyncBlockRefresher = void 0;
+exports.SyncBlockRefresher = exports.SYNC_BLOCK_FETCH_INTERVAL = void 0;
 var _react = require("react");
-var REFRESH_INTERVAL = 3000;
+var SYNC_BLOCK_FETCH_INTERVAL = exports.SYNC_BLOCK_FETCH_INTERVAL = 3000;
 
 // Component that refreshes synced block subscriptions at regular intervals
 // this is a workaround for the subscription mechanism not being real-time
@@ -18,7 +18,7 @@ var SyncBlockRefresher = exports.SyncBlockRefresher = function SyncBlockRefreshe
       if (((_document = document) === null || _document === void 0 ? void 0 : _document.visibilityState) === 'visible') {
         syncBlockStoreManager.refreshSubscriptions();
       }
-    }, REFRESH_INTERVAL);
+    }, SYNC_BLOCK_FETCH_INTERVAL);
     return function () {
       window.clearInterval(interval);
     };

package/dist/cjs/ui/SyncBlockRendererWrapper.js

@@ -12,8 +12,10 @@ var SyncBlockRendererWrapperDataId = 'sync-block-plugin-renderer-wrapper';
 var SyncBlockRendererWrapperComponent = function SyncBlockRendererWrapperComponent(_ref) {
   var getSyncedBlockRenderer = _ref.getSyncedBlockRenderer,
     useFetchSyncBlockData = _ref.useFetchSyncBlockData,
-    syncBlockRendererDataProviders = _ref.syncBlockRendererDataProviders;
-  return /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement(_SyncBlockLabel.SyncBlockLabel, null), /*#__PURE__*/_react.default.createElement("div", {
+    syncBlockRendererDataProviders = _ref.syncBlockRendererDataProviders,
+    localId = _ref.localId,
+    useFetchSyncBlockTitle = _ref.useFetchSyncBlockTitle;
+  return /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement("div", {
     "data-testid": SyncBlockRendererWrapperDataId
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop
     ,
@@ -21,6 +23,10 @@ var SyncBlockRendererWrapperComponent = function SyncBlockRendererWrapperCompone
   }, getSyncedBlockRenderer({
     syncBlockRendererDataProviders: syncBlockRendererDataProviders,
     useFetchSyncBlockData: useFetchSyncBlockData
-  })));
+  })), /*#__PURE__*/_react.default.createElement(_SyncBlockLabel.SyncBlockLabel, {
+    isSource: false,
+    useFetchSyncBlockTitle: useFetchSyncBlockTitle,
+    localId: localId
+  }));
 };
 var SyncBlockRendererWrapper = exports.SyncBlockRendererWrapper = /*#__PURE__*/_react.default.memo(SyncBlockRendererWrapperComponent);

package/dist/cjs/ui/floating-toolbar.js

@@ -45,7 +45,7 @@ var getToolbarConfig = exports.getToolbarConfig = function getToolbarConfig(stat
     appearance: 'subtle',
     icon: _copy.default,
     title: formatMessage(_messages.syncBlockMessages.copySyncBlockLabel),
-    showTitle: true,
+    showTitle: false,
     tooltipContent: formatMessage(_messages.syncBlockMessages.copySyncBlockTooltip),
     onClick: (0, _editorCommands.copySyncedBlockReferenceToClipboard)(api)
   }, hoverDecorationProps(nodeType, _consts.akEditorSelectedNodeClassName));
@@ -70,9 +70,6 @@ var getToolbarConfig = exports.getToolbarConfig = function getToolbarConfig(stat
   // see hideOnEsc in platform/packages/editor/editor-plugin-floating-toolbar/src/ui/Dropdown.tsx
   var testId = 'synced-block-overflow-dropdown-trigger';
   var overflowMenuConfig = [{
-    type: 'separator',
-    fullHeight: true
-  }, {
     type: 'overflow-dropdown',
     testId: testId,
     options: [_objectSpread({

package/dist/es2019/nodeviews/syncedBlock.js

@@ -1,7 +1,7 @@
 import React from 'react';
 import ReactNodeView from '@atlaskit/editor-common/react-node-view';
 import { SyncBlockSharedCssClassName } from '@atlaskit/editor-common/sync-block';
-import { useFetchSyncBlockData } from '@atlaskit/editor-synced-block-provider';
+import { useFetchSyncBlockData, useFetchSyncBlockTitle } from '@atlaskit/editor-synced-block-provider';
 import { SyncBlockRendererWrapper } from '../ui/SyncBlockRendererWrapper';
 class SyncBlock extends ReactNodeView {
   constructor(props) {
@@ -19,20 +19,25 @@ class SyncBlock extends ReactNodeView {
     if (!((_this$options = this.options) !== null && _this$options !== void 0 && _this$options.getSyncedBlockRenderer)) {
       return null;
     }
+    const {
+      resourceId,
+      localId
+    } = this.node.attrs;
+    if (!resourceId || !localId) {
+      return null;
+    }
 
     // get document node from data provider
-
     return /*#__PURE__*/React.createElement(SyncBlockRendererWrapper, {
+      localId: this.node.attrs.localId,
       getSyncedBlockRenderer: (_this$options2 = this.options) === null || _this$options2 === void 0 ? void 0 : _this$options2.getSyncedBlockRenderer,
       syncBlockRendererDataProviders: (_this$options3 = this.options) === null || _this$options3 === void 0 ? void 0 : _this$options3.syncBlockRendererDataProviders,
-      useFetchSyncBlockData: () => useFetchSyncBlockData(this.syncBlockStore, this.node)
+      useFetchSyncBlockTitle: () => useFetchSyncBlockTitle(this.syncBlockStore, this.node),
+      useFetchSyncBlockData: () => useFetchSyncBlockData(this.syncBlockStore, resourceId, localId)
     });
   }
   destroy() {
     var _this$unsubscribe;
-    if (this.fetchIntervalId) {
-      window.clearInterval(this.fetchIntervalId);
-    }
     (_this$unsubscribe = this.unsubscribe) === null || _this$unsubscribe === void 0 ? void 0 : _this$unsubscribe.call(this);
     super.destroy();
   }

package/dist/es2019/ui/BodiedSyncBlockWrapper.js

@@ -7,8 +7,11 @@ export const BodiedSyncBlockWrapper = /*#__PURE__*/React.forwardRef(({
 }, ref) => {
   // TODO: EDITOR-2429 - this should be debounced (either here or in the data provider) to avoid excessive API writes
   useHandleContentChanges(syncBlockStore, node);
-  return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(SyncBlockLabel, null), /*#__PURE__*/React.createElement("div", {
+  return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", {
     "data-testid": "bodied-sync-block-wrapper",
     ref: ref
+  }), /*#__PURE__*/React.createElement(SyncBlockLabel, {
+    isSource: true,
+    localId: node.attrs.localId
   }));
 });

package/dist/es2019/ui/CreateSyncedBlockDropdownItem.js

@@ -2,6 +2,8 @@ import React from 'react';
 import { useIntl } from 'react-intl-next';
 import { blockMenuMessages } from '@atlaskit/editor-common/messages';
 import { SyncBlocksIcon, ToolbarDropdownItem } from '@atlaskit/editor-toolbar';
+import Lozenge from '@atlaskit/lozenge';
+import { Flex, Text } from '@atlaskit/primitives/compiled';
 import { canBeConvertedToSyncBlock } from '../pm-plugins/utils/utils';
 export const CreateSyncedBlockDropdownItem = ({
   api
@@ -38,5 +40,10 @@ export const CreateSyncedBlockDropdownItem = ({
       label: ""
     }),
     onClick: onClick
-  }, selection !== null && selection !== void 0 && selection.empty ? formatMessage(blockMenuMessages.createSyncedBlock) : formatMessage(blockMenuMessages.convertToSyncedBlock));
+  }, /*#__PURE__*/React.createElement(Flex, {
+    alignItems: "center",
+    gap: "space.050"
+  }, /*#__PURE__*/React.createElement(Text, null, selection !== null && selection !== void 0 && selection.empty ? formatMessage(blockMenuMessages.createSyncedBlock) : formatMessage(blockMenuMessages.convertToSyncedBlock)), /*#__PURE__*/React.createElement(Lozenge, {
+    appearance: "new"
+  }, formatMessage(blockMenuMessages.newLozenge))));
 };

package/dist/es2019/ui/SyncBlockLabel.js

@@ -2,16 +2,49 @@ import React from 'react';
 import { useIntl } from 'react-intl-next';
 import { syncBlockMessages as messages } from '@atlaskit/editor-common/messages';
 import { SyncBlockLabelSharedCssClassName } from '@atlaskit/editor-common/sync-block';
+import { ConfluenceIcon } from '@atlaskit/logo';
+import { Text } from '@atlaskit/primitives/compiled';
+import Tooltip from '@atlaskit/tooltip';
+import VisuallyHidden from '@atlaskit/visually-hidden';
 const SyncBlockLabelDataId = 'sync-block-label';
-const SyncBlockLabelComponent = () => {
+const SyncBlockLabelComponent = ({
+  isSource,
+  useFetchSyncBlockTitle,
+  localId
+}) => {
   const {
     formatMessage
   } = useIntl();
-  return /*#__PURE__*/React.createElement("div", {
+  const title = useFetchSyncBlockTitle === null || useFetchSyncBlockTitle === void 0 ? void 0 : useFetchSyncBlockTitle();
+  const tooltipContent = isSource ? formatMessage(messages.sourceSyncBlockTooltip) : title ? formatMessage(messages.referenceSyncBlockTooltip, {
+    title
+  }) : formatMessage(messages.defaultSyncBlockTooltip);
+  const ariaDescribedById = `sync-block-label-description-${localId}`;
+  return /*#__PURE__*/React.createElement(Tooltip, {
+    position: "top",
+    content: tooltipContent
+    // workaround because tooltip adds aria-describedby with a new id every time the tooltip is opened
+    // this causes an infinite rerender loop because of the forwardRef from the node view we are inside in bodiedSyncBlock
+    // tooltip content is available for screen readers in visually hidden content after the label
+    ,
+    isScreenReaderAnnouncementDisabled: true
+  }, /*#__PURE__*/React.createElement("div", {
     "data-testid": SyncBlockLabelDataId
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop
     ,
-    className: SyncBlockLabelSharedCssClassName.labelClassName
-  }, formatMessage(messages.syncedBlockLabel));
+    className: SyncBlockLabelSharedCssClassName.labelClassName,
+    "aria-describedby": ariaDescribedById
+  }, /*#__PURE__*/React.createElement(ConfluenceIcon, {
+    size: "xsmall",
+    appearance: "neutral",
+    shouldUseNewLogoDesign: true
+  }), isSource || !title ? /*#__PURE__*/React.createElement(Text, {
+    size: "small"
+  }, formatMessage(messages.syncedBlockLabel)) : /*#__PURE__*/React.createElement(Text, {
+    maxLines: 1,
+    size: "small"
+  }, title)), /*#__PURE__*/React.createElement(VisuallyHidden, {
+    id: ariaDescribedById
+  }, tooltipContent));
 };
 export const SyncBlockLabel = /*#__PURE__*/React.memo(SyncBlockLabelComponent);

package/dist/es2019/ui/SyncBlockRefresher.js

@@ -1,5 +1,5 @@
 import { useEffect } from 'react';
-const REFRESH_INTERVAL = 3000;
+export const SYNC_BLOCK_FETCH_INTERVAL = 3000;
 
 // Component that refreshes synced block subscriptions at regular intervals
 // this is a workaround for the subscription mechanism not being real-time
@@ -13,7 +13,7 @@ export const SyncBlockRefresher = ({
       if (((_document = document) === null || _document === void 0 ? void 0 : _document.visibilityState) === 'visible') {
         syncBlockStoreManager.refreshSubscriptions();
       }
-    }, REFRESH_INTERVAL);
+    }, SYNC_BLOCK_FETCH_INTERVAL);
     return () => {
       window.clearInterval(interval);
     };

package/dist/es2019/ui/SyncBlockRendererWrapper.js

@@ -5,9 +5,11 @@ const SyncBlockRendererWrapperDataId = 'sync-block-plugin-renderer-wrapper';
 const SyncBlockRendererWrapperComponent = ({
   getSyncedBlockRenderer,
   useFetchSyncBlockData,
-  syncBlockRendererDataProviders
+  syncBlockRendererDataProviders,
+  localId,
+  useFetchSyncBlockTitle
 }) => {
-  return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(SyncBlockLabel, null), /*#__PURE__*/React.createElement("div", {
+  return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", {
     "data-testid": SyncBlockRendererWrapperDataId
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop
     ,
@@ -15,6 +17,10 @@ const SyncBlockRendererWrapperComponent = ({
   }, getSyncedBlockRenderer({
     syncBlockRendererDataProviders,
     useFetchSyncBlockData
-  })));
+  })), /*#__PURE__*/React.createElement(SyncBlockLabel, {
+    isSource: false,
+    useFetchSyncBlockTitle: useFetchSyncBlockTitle,
+    localId: localId
+  }));
 };
 export const SyncBlockRendererWrapper = /*#__PURE__*/React.memo(SyncBlockRendererWrapperComponent);

package/dist/es2019/ui/floating-toolbar.js

@@ -39,7 +39,7 @@ export const getToolbarConfig = (state, intl, api, syncBlockStore) => {
     appearance: 'subtle',
     icon: CopyIcon,
     title: formatMessage(messages.copySyncBlockLabel),
-    showTitle: true,
+    showTitle: false,
     tooltipContent: formatMessage(messages.copySyncBlockTooltip),
     onClick: copySyncedBlockReferenceToClipboard(api),
     ...hoverDecorationProps(nodeType, akEditorSelectedNodeClassName)
@@ -66,9 +66,6 @@ export const getToolbarConfig = (state, intl, api, syncBlockStore) => {
   // see hideOnEsc in platform/packages/editor/editor-plugin-floating-toolbar/src/ui/Dropdown.tsx
   const testId = 'synced-block-overflow-dropdown-trigger';
   const overflowMenuConfig = [{
-    type: 'separator',
-    fullHeight: true
-  }, {
     type: 'overflow-dropdown',
     testId,
     options: [{

package/dist/esm/nodeviews/syncedBlock.js

@@ -10,7 +10,7 @@ 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 { useFetchSyncBlockData as _useFetchSyncBlockData } from '@atlaskit/editor-synced-block-provider';
+import { useFetchSyncBlockData as _useFetchSyncBlockData, useFetchSyncBlockTitle as _useFetchSyncBlockTitle } from '@atlaskit/editor-synced-block-provider';
 import { SyncBlockRendererWrapper } from '../ui/SyncBlockRendererWrapper';
 var SyncBlock = /*#__PURE__*/function (_ReactNodeView) {
   function SyncBlock(props) {
@@ -39,14 +39,23 @@ var SyncBlock = /*#__PURE__*/function (_ReactNodeView) {
       if (!((_this$options = this.options) !== null && _this$options !== void 0 && _this$options.getSyncedBlockRenderer)) {
         return null;
       }
+      var _this$node$attrs = this.node.attrs,
+        resourceId = _this$node$attrs.resourceId,
+        localId = _this$node$attrs.localId;
+      if (!resourceId || !localId) {
+        return null;
+      }
 
       // get document node from data provider
-
       return /*#__PURE__*/React.createElement(SyncBlockRendererWrapper, {
+        localId: this.node.attrs.localId,
         getSyncedBlockRenderer: (_this$options2 = this.options) === null || _this$options2 === void 0 ? void 0 : _this$options2.getSyncedBlockRenderer,
         syncBlockRendererDataProviders: (_this$options3 = this.options) === null || _this$options3 === void 0 ? void 0 : _this$options3.syncBlockRendererDataProviders,
+        useFetchSyncBlockTitle: function useFetchSyncBlockTitle() {
+          return _useFetchSyncBlockTitle(_this2.syncBlockStore, _this2.node);
+        },
         useFetchSyncBlockData: function useFetchSyncBlockData() {
-          return _useFetchSyncBlockData(_this2.syncBlockStore, _this2.node);
+          return _useFetchSyncBlockData(_this2.syncBlockStore, resourceId, localId);
         }
       });
     }
@@ -54,9 +63,6 @@ var SyncBlock = /*#__PURE__*/function (_ReactNodeView) {
     key: "destroy",
     value: function destroy() {
       var _this$unsubscribe;
-      if (this.fetchIntervalId) {
-        window.clearInterval(this.fetchIntervalId);
-      }
       (_this$unsubscribe = this.unsubscribe) === null || _this$unsubscribe === void 0 || _this$unsubscribe.call(this);
       _superPropGet(SyncBlock, "destroy", this, 3)([]);
     }

package/dist/esm/ui/BodiedSyncBlockWrapper.js

@@ -6,8 +6,11 @@ export var BodiedSyncBlockWrapper = /*#__PURE__*/React.forwardRef(function (_ref
     syncBlockStore = _ref.syncBlockStore;
   // TODO: EDITOR-2429 - this should be debounced (either here or in the data provider) to avoid excessive API writes
   useHandleContentChanges(syncBlockStore, node);
-  return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(SyncBlockLabel, null), /*#__PURE__*/React.createElement("div", {
+  return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", {
     "data-testid": "bodied-sync-block-wrapper",
     ref: ref
+  }), /*#__PURE__*/React.createElement(SyncBlockLabel, {
+    isSource: true,
+    localId: node.attrs.localId
   }));
 });

package/dist/esm/ui/CreateSyncedBlockDropdownItem.js

@@ -2,6 +2,8 @@ import React from 'react';
 import { useIntl } from 'react-intl-next';
 import { blockMenuMessages } from '@atlaskit/editor-common/messages';
 import { SyncBlocksIcon, ToolbarDropdownItem } from '@atlaskit/editor-toolbar';
+import Lozenge from '@atlaskit/lozenge';
+import { Flex, Text } from '@atlaskit/primitives/compiled';
 import { canBeConvertedToSyncBlock } from '../pm-plugins/utils/utils';
 export var CreateSyncedBlockDropdownItem = function CreateSyncedBlockDropdownItem(_ref) {
   var _api$selection;
@@ -35,5 +37,10 @@ export var CreateSyncedBlockDropdownItem = function CreateSyncedBlockDropdownIte
       label: ""
     }),
     onClick: onClick
-  }, selection !== null && selection !== void 0 && selection.empty ? formatMessage(blockMenuMessages.createSyncedBlock) : formatMessage(blockMenuMessages.convertToSyncedBlock));
+  }, /*#__PURE__*/React.createElement(Flex, {
+    alignItems: "center",
+    gap: "space.050"
+  }, /*#__PURE__*/React.createElement(Text, null, selection !== null && selection !== void 0 && selection.empty ? formatMessage(blockMenuMessages.createSyncedBlock) : formatMessage(blockMenuMessages.convertToSyncedBlock)), /*#__PURE__*/React.createElement(Lozenge, {
+    appearance: "new"
+  }, formatMessage(blockMenuMessages.newLozenge))));
 };

package/dist/esm/ui/SyncBlockLabel.js

@@ -2,15 +2,47 @@ import React from 'react';
 import { useIntl } from 'react-intl-next';
 import { syncBlockMessages as messages } from '@atlaskit/editor-common/messages';
 import { SyncBlockLabelSharedCssClassName } from '@atlaskit/editor-common/sync-block';
+import { ConfluenceIcon } from '@atlaskit/logo';
+import { Text } from '@atlaskit/primitives/compiled';
+import Tooltip from '@atlaskit/tooltip';
+import VisuallyHidden from '@atlaskit/visually-hidden';
 var SyncBlockLabelDataId = 'sync-block-label';
-var SyncBlockLabelComponent = function SyncBlockLabelComponent() {
+var SyncBlockLabelComponent = function SyncBlockLabelComponent(_ref) {
+  var isSource = _ref.isSource,
+    useFetchSyncBlockTitle = _ref.useFetchSyncBlockTitle,
+    localId = _ref.localId;
   var _useIntl = useIntl(),
     formatMessage = _useIntl.formatMessage;
-  return /*#__PURE__*/React.createElement("div", {
+  var title = useFetchSyncBlockTitle === null || useFetchSyncBlockTitle === void 0 ? void 0 : useFetchSyncBlockTitle();
+  var tooltipContent = isSource ? formatMessage(messages.sourceSyncBlockTooltip) : title ? formatMessage(messages.referenceSyncBlockTooltip, {
+    title: title
+  }) : formatMessage(messages.defaultSyncBlockTooltip);
+  var ariaDescribedById = "sync-block-label-description-".concat(localId);
+  return /*#__PURE__*/React.createElement(Tooltip, {
+    position: "top",
+    content: tooltipContent
+    // workaround because tooltip adds aria-describedby with a new id every time the tooltip is opened
+    // this causes an infinite rerender loop because of the forwardRef from the node view we are inside in bodiedSyncBlock
+    // tooltip content is available for screen readers in visually hidden content after the label
+    ,
+    isScreenReaderAnnouncementDisabled: true
+  }, /*#__PURE__*/React.createElement("div", {
     "data-testid": SyncBlockLabelDataId
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop
     ,
-    className: SyncBlockLabelSharedCssClassName.labelClassName
-  }, formatMessage(messages.syncedBlockLabel));
+    className: SyncBlockLabelSharedCssClassName.labelClassName,
+    "aria-describedby": ariaDescribedById
+  }, /*#__PURE__*/React.createElement(ConfluenceIcon, {
+    size: "xsmall",
+    appearance: "neutral",
+    shouldUseNewLogoDesign: true
+  }), isSource || !title ? /*#__PURE__*/React.createElement(Text, {
+    size: "small"
+  }, formatMessage(messages.syncedBlockLabel)) : /*#__PURE__*/React.createElement(Text, {
+    maxLines: 1,
+    size: "small"
+  }, title)), /*#__PURE__*/React.createElement(VisuallyHidden, {
+    id: ariaDescribedById
+  }, tooltipContent));
 };
 export var SyncBlockLabel = /*#__PURE__*/React.memo(SyncBlockLabelComponent);

package/dist/esm/ui/SyncBlockRefresher.js

@@ -1,5 +1,5 @@
 import { useEffect } from 'react';
-var REFRESH_INTERVAL = 3000;
+export var SYNC_BLOCK_FETCH_INTERVAL = 3000;
 
 // Component that refreshes synced block subscriptions at regular intervals
 // this is a workaround for the subscription mechanism not being real-time
@@ -12,7 +12,7 @@ export var SyncBlockRefresher = function SyncBlockRefresher(_ref) {
       if (((_document = document) === null || _document === void 0 ? void 0 : _document.visibilityState) === 'visible') {
         syncBlockStoreManager.refreshSubscriptions();
       }
-    }, REFRESH_INTERVAL);
+    }, SYNC_BLOCK_FETCH_INTERVAL);
     return function () {
       window.clearInterval(interval);
     };

package/dist/esm/ui/SyncBlockRendererWrapper.js

@@ -5,8 +5,10 @@ var SyncBlockRendererWrapperDataId = 'sync-block-plugin-renderer-wrapper';
 var SyncBlockRendererWrapperComponent = function SyncBlockRendererWrapperComponent(_ref) {
   var getSyncedBlockRenderer = _ref.getSyncedBlockRenderer,
     useFetchSyncBlockData = _ref.useFetchSyncBlockData,
-    syncBlockRendererDataProviders = _ref.syncBlockRendererDataProviders;
-  return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(SyncBlockLabel, null), /*#__PURE__*/React.createElement("div", {
+    syncBlockRendererDataProviders = _ref.syncBlockRendererDataProviders,
+    localId = _ref.localId,
+    useFetchSyncBlockTitle = _ref.useFetchSyncBlockTitle;
+  return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", {
     "data-testid": SyncBlockRendererWrapperDataId
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop
     ,
@@ -14,6 +16,10 @@ var SyncBlockRendererWrapperComponent = function SyncBlockRendererWrapperCompone
   }, getSyncedBlockRenderer({
     syncBlockRendererDataProviders: syncBlockRendererDataProviders,
     useFetchSyncBlockData: useFetchSyncBlockData
-  })));
+  })), /*#__PURE__*/React.createElement(SyncBlockLabel, {
+    isSource: false,
+    useFetchSyncBlockTitle: useFetchSyncBlockTitle,
+    localId: localId
+  }));
 };
 export var SyncBlockRendererWrapper = /*#__PURE__*/React.memo(SyncBlockRendererWrapperComponent);

package/dist/esm/ui/floating-toolbar.js

@@ -36,7 +36,7 @@ export var getToolbarConfig = function getToolbarConfig(state, intl, api, syncBl
     appearance: 'subtle',
     icon: CopyIcon,
     title: formatMessage(messages.copySyncBlockLabel),
-    showTitle: true,
+    showTitle: false,
     tooltipContent: formatMessage(messages.copySyncBlockTooltip),
     onClick: copySyncedBlockReferenceToClipboard(api)
   }, hoverDecorationProps(nodeType, akEditorSelectedNodeClassName));
@@ -61,9 +61,6 @@ export var getToolbarConfig = function getToolbarConfig(state, intl, api, syncBl
   // see hideOnEsc in platform/packages/editor/editor-plugin-floating-toolbar/src/ui/Dropdown.tsx
   var testId = 'synced-block-overflow-dropdown-trigger';
   var overflowMenuConfig = [{
-    type: 'separator',
-    fullHeight: true
-  }, {
     type: 'overflow-dropdown',
     testId: testId,
     options: [_objectSpread({

package/dist/types/syncedBlockPluginType.d.ts

@@ -9,7 +9,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 { SyncBlockInstance, SyncBlockDataProvider } from '@atlaskit/editor-synced-block-provider';
+import type { SyncBlockDataProvider, UseFetchSyncBlockDataResult } from '@atlaskit/editor-synced-block-provider';
 export type SyncedBlockEditorProps = {
     defaultDocument: JSONDocNode;
     onChange: (editorView: EditorView, meta: {
@@ -34,7 +34,7 @@ export type SyncedBlockEditorProps = {
 };
 export type SyncedBlockRendererProps = {
     syncBlockRendererDataProviders: SyncedBlockRendererDataProviders;
-    useFetchSyncBlockData: () => SyncBlockInstance | null;
+    useFetchSyncBlockData: () => UseFetchSyncBlockDataResult;
 };
 export type SyncedBlockPluginOptions = {
     getSyncedBlockRenderer: (props: SyncedBlockRendererProps) => React.JSX.Element;

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

@@ -1,2 +1,8 @@
 import React from 'react';
-export declare const SyncBlockLabel: React.MemoExoticComponent<() => React.JSX.Element>;
+type SyncBlockLabelProps = {
+    isSource: boolean;
+    localId: string;
+    useFetchSyncBlockTitle?: () => string | undefined;
+};
+export declare const SyncBlockLabel: React.MemoExoticComponent<({ isSource, useFetchSyncBlockTitle, localId, }: SyncBlockLabelProps) => React.JSX.Element>;
+export {};

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

@@ -1,4 +1,5 @@
 import type { SyncBlockStoreManager } from '@atlaskit/editor-synced-block-provider';
+export declare const SYNC_BLOCK_FETCH_INTERVAL = 3000;
 export declare const SyncBlockRefresher: ({ syncBlockStoreManager, }: {
     syncBlockStoreManager: SyncBlockStoreManager;
 }) => null;

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

@@ -1,11 +1,13 @@
 import React from 'react';
 import type { SyncedBlockRendererDataProviders } from '@atlaskit/editor-common/provider-factory';
-import type { SyncBlockInstance } from '@atlaskit/editor-synced-block-provider';
+import type { UseFetchSyncBlockDataResult } from '@atlaskit/editor-synced-block-provider';
 import type { SyncedBlockRendererProps } from '../syncedBlockPluginType';
 type Props = {
     getSyncedBlockRenderer: (props: SyncedBlockRendererProps) => React.JSX.Element;
+    localId: string;
     syncBlockRendererDataProviders: SyncedBlockRendererDataProviders;
-    useFetchSyncBlockData: () => SyncBlockInstance | null;
+    useFetchSyncBlockData: () => UseFetchSyncBlockDataResult;
+    useFetchSyncBlockTitle: () => string | undefined;
 };
-export declare const SyncBlockRendererWrapper: React.MemoExoticComponent<({ getSyncedBlockRenderer, useFetchSyncBlockData, syncBlockRendererDataProviders, }: Props) => React.JSX.Element>;
+export declare const SyncBlockRendererWrapper: React.MemoExoticComponent<({ getSyncedBlockRenderer, useFetchSyncBlockData, syncBlockRendererDataProviders, localId, useFetchSyncBlockTitle, }: Props) => React.JSX.Element>;
 export {};

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

@@ -9,7 +9,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 { SyncBlockInstance, SyncBlockDataProvider } from '@atlaskit/editor-synced-block-provider';
+import type { SyncBlockDataProvider, UseFetchSyncBlockDataResult } from '@atlaskit/editor-synced-block-provider';
 export type SyncedBlockEditorProps = {
     defaultDocument: JSONDocNode;
     onChange: (editorView: EditorView, meta: {
@@ -34,7 +34,7 @@ export type SyncedBlockEditorProps = {
 };
 export type SyncedBlockRendererProps = {
     syncBlockRendererDataProviders: SyncedBlockRendererDataProviders;
-    useFetchSyncBlockData: () => SyncBlockInstance | null;
+    useFetchSyncBlockData: () => UseFetchSyncBlockDataResult;
 };
 export type SyncedBlockPluginOptions = {
     getSyncedBlockRenderer: (props: SyncedBlockRendererProps) => React.JSX.Element;

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

@@ -1,2 +1,8 @@
 import React from 'react';
-export declare const SyncBlockLabel: React.MemoExoticComponent<() => React.JSX.Element>;
+type SyncBlockLabelProps = {
+    isSource: boolean;
+    localId: string;
+    useFetchSyncBlockTitle?: () => string | undefined;
+};
+export declare const SyncBlockLabel: React.MemoExoticComponent<({ isSource, useFetchSyncBlockTitle, localId, }: SyncBlockLabelProps) => React.JSX.Element>;
+export {};

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

@@ -1,4 +1,5 @@
 import type { SyncBlockStoreManager } from '@atlaskit/editor-synced-block-provider';
+export declare const SYNC_BLOCK_FETCH_INTERVAL = 3000;
 export declare const SyncBlockRefresher: ({ syncBlockStoreManager, }: {
     syncBlockStoreManager: SyncBlockStoreManager;
 }) => null;

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

@@ -1,11 +1,13 @@
 import React from 'react';
 import type { SyncedBlockRendererDataProviders } from '@atlaskit/editor-common/provider-factory';
-import type { SyncBlockInstance } from '@atlaskit/editor-synced-block-provider';
+import type { UseFetchSyncBlockDataResult } from '@atlaskit/editor-synced-block-provider';
 import type { SyncedBlockRendererProps } from '../syncedBlockPluginType';
 type Props = {
     getSyncedBlockRenderer: (props: SyncedBlockRendererProps) => React.JSX.Element;
+    localId: string;
     syncBlockRendererDataProviders: SyncedBlockRendererDataProviders;
-    useFetchSyncBlockData: () => SyncBlockInstance | null;
+    useFetchSyncBlockData: () => UseFetchSyncBlockDataResult;
+    useFetchSyncBlockTitle: () => string | undefined;
 };
-export declare const SyncBlockRendererWrapper: React.MemoExoticComponent<({ getSyncedBlockRenderer, useFetchSyncBlockData, syncBlockRendererDataProviders, }: Props) => React.JSX.Element>;
+export declare const SyncBlockRendererWrapper: React.MemoExoticComponent<({ getSyncedBlockRenderer, useFetchSyncBlockData, syncBlockRendererDataProviders, localId, useFetchSyncBlockTitle, }: Props) => React.JSX.Element>;
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-synced-block",
-	"version": "4.0.0",
+	"version": "4.1.0",
 	"description": "SyncedBlock plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -38,16 +38,21 @@
 		"@atlaskit/editor-plugin-selection": "^6.1.0",
 		"@atlaskit/editor-prosemirror": "7.0.0",
 		"@atlaskit/editor-shared-styles": "^3.8.0",
-		"@atlaskit/editor-synced-block-provider": "^2.5.0",
+		"@atlaskit/editor-synced-block-provider": "^2.6.0",
 		"@atlaskit/editor-tables": "^2.9.0",
 		"@atlaskit/editor-toolbar": "^0.17.0",
 		"@atlaskit/icon": "28.5.3",
+		"@atlaskit/logo": "^19.9.0",
+		"@atlaskit/lozenge": "^13.0.0",
 		"@atlaskit/modal-dialog": "^14.6.0",
+		"@atlaskit/primitives": "^16.1.0",
+		"@atlaskit/tooltip": "^20.7.0",
+		"@atlaskit/visually-hidden": "^3.0.0",
 		"@babel/runtime": "^7.0.0",
 		"react-intl-next": "npm:react-intl@^5.18.1"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^110.21.0",
+		"@atlaskit/editor-common": "^110.22.0",
 		"react": "^18.2.0"
 	},
 	"devDependencies": {