@atlaskit/editor-plugin-synced-block 20.1.5 → 21.0.1

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

@@ -15,11 +15,10 @@ import DeleteIcon from '@atlaskit/icon/core/delete';
 import EditIcon from '@atlaskit/icon/core/edit';
 import LinkBrokenIcon from '@atlaskit/icon/core/link-broken';
 import MegaphoneIcon from '@atlaskit/icon/core/megaphone';
-import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { copySyncedBlockReferenceToClipboard, editSyncedBlockSource, removeSyncedBlock, unsync } from '../editor-commands';
 import { findSyncBlockOrBodiedSyncBlock, isBodiedSyncBlockNode } from '../pm-plugins/utils/utils';
 import { SYNCED_BLOCK_BUTTON_TEST_ID } from '../types';
-import { SyncedLocationDropdown, SyncedLocationDropdownWithCount } from './SyncedLocationDropdown';
+import { SyncedLocationDropdownWithCount } from './SyncedLocationDropdown';
 export var getToolbarConfig = function getToolbarConfig(state, intl, api, syncBlockStore, isLivePage, onGiveFeedback) {
   var _syncBlockInstance$er, _api$decorations, _api$connectivity;
   var syncBlockObject = findSyncBlockOrBodiedSyncBlock(state.schema, state.selection);
@@ -29,7 +28,6 @@ export var getToolbarConfig = function getToolbarConfig(state, intl, api, syncBl
   if (syncBlockStore.sourceManager.isPendingCreation(syncBlockObject.node.attrs.resourceId)) {
     return;
   }
-  var isSyncBlockActivationEnabled = expValEquals('platform_editor_sync_block_activation', 'isEnabled', true);
   var syncBlockInstance = syncBlockStore.referenceManager.getFromCache(syncBlockObject.node.attrs.resourceId);
   var isUnsyncedBlock = (syncBlockInstance === null || syncBlockInstance === void 0 || (_syncBlockInstance$er = syncBlockInstance.error) === null || _syncBlockInstance$er === void 0 ? void 0 : _syncBlockInstance$er.type) === SyncBlockError.NotFound;
   var isErroredBlock = syncBlockInstance === null || syncBlockInstance === void 0 ? void 0 : syncBlockInstance.error;
@@ -60,45 +58,24 @@ export var getToolbarConfig = function getToolbarConfig(state, intl, api, syncBl
     }, hoverDecorationProps(nodeType, akEditorSelectedNodeClassName));
     items.push(deleteButton);
   } else {
-    // When the synced block activation experiment is enabled, the copy action is
-    // re-framed as the primary "Copy to sync" action: it shows a visible label and
-    // is moved to the first toolbar position (before the synced-location info). See
-    // EDITOR-8060.
     var copyButton = _objectSpread({
       id: 'editor.syncedBlock.copy',
       type: 'button',
       appearance: 'subtle',
       icon: CopyIcon,
-      title: isSyncBlockActivationEnabled ? formatMessage(messages.copyToSyncLabel) : formatMessage(messages.copySyncBlockLabel),
-      showTitle: isSyncBlockActivationEnabled,
-      tooltipContent: isSyncBlockActivationEnabled ? undefined : formatMessage(messages.copySyncedBlockTooltip),
-      testId: isSyncBlockActivationEnabled ? SYNCED_BLOCK_BUTTON_TEST_ID.syncedBlockToolbarCopy : undefined,
+      title: formatMessage(messages.copyToSyncLabel),
+      showTitle: true,
+      testId: SYNCED_BLOCK_BUTTON_TEST_ID.syncedBlockToolbarCopy,
       onClick: copySyncedBlockReferenceToClipboard(syncBlockStore, INPUT_METHOD.SYNCED_BLOCK_TB, api, isLivePage)
     }, hoverDecorationProps(nodeType, akEditorSelectedNodeClassName));
-
-    // In the activation experience the primary "Copy to sync" action leads the
-    // toolbar, ahead of the informational synced-location dropdown.
-    if (isSyncBlockActivationEnabled) {
-      items.push(copyButton);
-    }
+    items.push(copyButton);
     if (!isErroredBlock) {
       var syncedLocation = {
         type: 'custom',
         fallback: [],
         render: function render(_view, _idx, _dispatchAnalyticsEvent, floatingToolbarRenderContext) {
-          if (isSyncBlockActivationEnabled) {
-            return /*#__PURE__*/React.createElement(SyncedLocationDropdownWithCount, {
-              key: "".concat(resourceId, ":").concat(localId, ":").concat(isBodiedSyncBlock),
-              syncBlockStore: syncBlockStore,
-              resourceId: resourceId,
-              localId: localId,
-              intl: intl,
-              isSource: isBodiedSyncBlock,
-              api: api,
-              floatingToolbarRenderContext: floatingToolbarRenderContext
-            });
-          }
-          return /*#__PURE__*/React.createElement(SyncedLocationDropdown, {
+          return /*#__PURE__*/React.createElement(SyncedLocationDropdownWithCount, {
+            key: "".concat(resourceId, ":").concat(localId, ":").concat(isBodiedSyncBlock),
             syncBlockStore: syncBlockStore,
             resourceId: resourceId,
             localId: localId,
@@ -132,12 +109,6 @@ export var getToolbarConfig = function getToolbarConfig(state, intl, api, syncBl
       };
       items.push(syncedLocation, unsyncButton);
     }
-
-    // Outside the activation experience the copy button keeps its original
-    // (icon-only, secondary) position after the synced-location info.
-    if (!isSyncBlockActivationEnabled) {
-      items.push(copyButton);
-    }
     var disabled = !syncBlockStore.referenceManager.getSyncBlockURL(syncBlockObject.node.attrs.resourceId);
     if (!isBodiedSyncBlock) {
       var editSourceButton = _objectSpread({
@@ -153,56 +124,39 @@ export var getToolbarConfig = function getToolbarConfig(state, intl, api, syncBl
       }, hoverDecorationProps(nodeType, akEditorSelectedNodeClassName));
       items.push(editSourceButton);
     }
-    if (!isSyncBlockActivationEnabled) {
-      var separator = {
-        type: 'separator'
-      };
-      var _deleteButton = _objectSpread({
-        id: 'editor.syncedBlock.delete',
-        type: 'button',
-        appearance: 'danger',
+
+    // testId is required to show focus on trigger button on ESC key press
+    // see hideOnEsc in platform/packages/editor/editor-plugin-floating-toolbar/src/ui/Dropdown.tsx
+    var testId = isBodiedSyncBlock ? SYNCED_BLOCK_BUTTON_TEST_ID.syncedBlockToolbarSourceOverflowTrigger : SYNCED_BLOCK_BUTTON_TEST_ID.syncedBlockToolbarReferenceOverflowTrigger;
+    var overflowMenuConfig = [{
+      type: 'overflow-dropdown',
+      testId: testId,
+      options: [].concat(_toConsumableArray(onGiveFeedback ? [{
+        title: formatMessage(toolbarInsertBlockMessages.feedbackDialog),
+        icon: /*#__PURE__*/React.createElement(MegaphoneIcon, {
+          label: ""
+        }),
+        onClick: function onClick() {
+          api === null || api === void 0 || api.core.actions.execute(function (_ref) {
+            var tr = _ref.tr;
+            return tr.setSelection(new GapCursorSelection(tr.doc.resolve(syncBlockObject.pos + syncBlockObject.node.nodeSize), Side.RIGHT));
+          });
+          onGiveFeedback({
+            blockType: isBodiedSyncBlock ? 'source' : 'reference',
+            entryPoint: 'overflow-menu'
+          });
+          return true;
+        }
+      }] : []), [_objectSpread({
         title: formatMessage(commonMessages.delete),
-        showTitle: false,
-        tooltipContent: formatMessage(commonMessages.delete),
         onClick: removeSyncedBlock(api),
-        icon: DeleteIcon,
+        icon: /*#__PURE__*/React.createElement(DeleteIcon, {
+          label: ""
+        }),
         testId: isBodiedSyncBlock ? SYNCED_BLOCK_BUTTON_TEST_ID.syncedBlockToolbarSourceDelete : SYNCED_BLOCK_BUTTON_TEST_ID.syncedBlockToolbarReferenceDelete
-      }, hoverDecorationProps(nodeType));
-      items.push(separator, _deleteButton);
-    } else {
-      // testId is required to show focus on trigger button on ESC key press
-      // see hideOnEsc in platform/packages/editor/editor-plugin-floating-toolbar/src/ui/Dropdown.tsx
-      var testId = isBodiedSyncBlock ? SYNCED_BLOCK_BUTTON_TEST_ID.syncedBlockToolbarSourceOverflowTrigger : SYNCED_BLOCK_BUTTON_TEST_ID.syncedBlockToolbarReferenceOverflowTrigger;
-      var overflowMenuConfig = [{
-        type: 'overflow-dropdown',
-        testId: testId,
-        options: [].concat(_toConsumableArray(isSyncBlockActivationEnabled && onGiveFeedback ? [{
-          title: formatMessage(toolbarInsertBlockMessages.feedbackDialog),
-          icon: /*#__PURE__*/React.createElement(MegaphoneIcon, {
-            label: ""
-          }),
-          onClick: function onClick() {
-            api === null || api === void 0 || api.core.actions.execute(function (_ref) {
-              var tr = _ref.tr;
-              return tr.setSelection(new GapCursorSelection(tr.doc.resolve(syncBlockObject.pos + syncBlockObject.node.nodeSize), Side.RIGHT));
-            });
-            onGiveFeedback({
-              blockType: isBodiedSyncBlock ? 'source' : 'reference',
-              entryPoint: 'overflow-menu'
-            });
-            return true;
-          }
-        }] : []), [_objectSpread({
-          title: formatMessage(commonMessages.delete),
-          onClick: removeSyncedBlock(api),
-          icon: /*#__PURE__*/React.createElement(DeleteIcon, {
-            label: ""
-          }),
-          testId: isBodiedSyncBlock ? SYNCED_BLOCK_BUTTON_TEST_ID.syncedBlockToolbarSourceDelete : SYNCED_BLOCK_BUTTON_TEST_ID.syncedBlockToolbarReferenceDelete
-        }, hoverDecorationProps(nodeType))])
-      }];
-      items.push.apply(items, overflowMenuConfig);
-    }
+      }, hoverDecorationProps(nodeType))])
+    }];
+    items.push.apply(items, overflowMenuConfig);
   }
   var getDomRef = function getDomRef(editorView) {
     var domAtPos = editorView.domAtPos.bind(editorView);

package/dist/esm/ui/quick-insert.js

@@ -7,7 +7,6 @@ import { blockTypeMessages } from '@atlaskit/editor-common/messages';
 import { IconSyncBlock } from '@atlaskit/editor-common/quick-insert';
 import Lozenge from '@atlaskit/lozenge/lozenge';
 import { fg } from '@atlaskit/platform-feature-flags/fg';
-import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { createSyncedBlock } from '../editor-commands';
 import { SYNCED_BLOCK_BUTTON_TEST_ID } from '../types';
 var lozengeWrapperStyles = null;
@@ -17,10 +16,9 @@ export var getQuickInsertConfig = function getQuickInsertConfig(config, api, syn
     if (!(config !== null && config !== void 0 && config.enableSourceCreation)) {
       return [];
     }
-    var syncBlockTitle = expValEquals('platform_editor_sync_block_activation', 'isEnabled', true) ? blockTypeMessages.syncedBlockQuickInsertTitle : blockTypeMessages.syncBlock;
     return [{
       id: 'syncBlock',
-      title: formatMessage(syncBlockTitle),
+      title: formatMessage(blockTypeMessages.syncedBlockQuickInsertTitle),
       description: formatMessage(blockTypeMessages.syncedBlockDescription),
       priority: 400,
       keywords: ['synced', 'block', 'synced-block', 'sync', 'sync-block', 'auto', 'update', 'excerpt', 'connect', 'create'],
@@ -33,7 +31,7 @@ export var getQuickInsertConfig = function getQuickInsertConfig(config, api, syn
       }, formatMessage(blockTypeMessages.newLozenge))),
       icon: function icon() {
         return /*#__PURE__*/React.createElement(IconSyncBlock, {
-          label: formatMessage(syncBlockTitle)
+          label: formatMessage(blockTypeMessages.syncedBlockQuickInsertTitle)
         });
       },
       action: function action(insert, state) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-synced-block",
-	"version": "20.1.5",
+	"version": "21.0.1",
 	"description": "SyncedBlock plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -21,27 +21,27 @@
 	"atlaskit:src": "src/index.ts",
 	"dependencies": {
 		"@atlaskit/adf-schema": "^57.6.0",
-		"@atlaskit/button": "25.4.3",
-		"@atlaskit/dropdown-menu": "20.0.1",
+		"@atlaskit/button": "25.4.4",
+		"@atlaskit/dropdown-menu": "21.0.0",
 		"@atlaskit/editor-json-transformer": "^10.0.0",
-		"@atlaskit/editor-plugin-analytics": "^22.0.0",
-		"@atlaskit/editor-plugin-block-controls": "^23.0.0",
-		"@atlaskit/editor-plugin-block-menu": "^21.0.0",
-		"@atlaskit/editor-plugin-connectivity": "22.0.0",
-		"@atlaskit/editor-plugin-content-format": "^16.0.0",
-		"@atlaskit/editor-plugin-decorations": "^22.0.0",
-		"@atlaskit/editor-plugin-editor-disabled": "^22.0.0",
-		"@atlaskit/editor-plugin-editor-viewmode": "^24.0.0",
-		"@atlaskit/editor-plugin-floating-toolbar": "^24.0.0",
-		"@atlaskit/editor-plugin-focus": "^21.0.0",
-		"@atlaskit/editor-plugin-history": "^22.1.0",
-		"@atlaskit/editor-plugin-selection": "^22.0.0",
-		"@atlaskit/editor-plugin-toolbar": "^19.0.0",
-		"@atlaskit/editor-plugin-ui-control-registry": "^16.0.0",
-		"@atlaskit/editor-plugin-user-intent": "^20.0.0",
+		"@atlaskit/editor-plugin-analytics": "^23.0.0",
+		"@atlaskit/editor-plugin-block-controls": "^24.0.0",
+		"@atlaskit/editor-plugin-block-menu": "^22.0.0",
+		"@atlaskit/editor-plugin-connectivity": "23.0.0",
+		"@atlaskit/editor-plugin-content-format": "^17.0.0",
+		"@atlaskit/editor-plugin-decorations": "^23.0.0",
+		"@atlaskit/editor-plugin-editor-disabled": "^23.0.0",
+		"@atlaskit/editor-plugin-editor-viewmode": "^25.0.0",
+		"@atlaskit/editor-plugin-floating-toolbar": "^25.0.0",
+		"@atlaskit/editor-plugin-focus": "^22.0.0",
+		"@atlaskit/editor-plugin-history": "^23.0.0",
+		"@atlaskit/editor-plugin-selection": "^23.0.0",
+		"@atlaskit/editor-plugin-toolbar": "^20.0.0",
+		"@atlaskit/editor-plugin-ui-control-registry": "^17.0.0",
+		"@atlaskit/editor-plugin-user-intent": "^21.0.0",
 		"@atlaskit/editor-prosemirror": "^9.0.0",
 		"@atlaskit/editor-shared-styles": "^4.3.0",
-		"@atlaskit/editor-synced-block-provider": "^18.0.0",
+		"@atlaskit/editor-synced-block-provider": "^19.0.0",
 		"@atlaskit/editor-toolbar": "^2.8.0",
 		"@atlaskit/flag": "^19.0.0",
 		"@atlaskit/icon": "38.0.2",
@@ -53,9 +53,9 @@
 		"@atlaskit/platform-feature-flags": "^2.2.0",
 		"@atlaskit/primitives": "^22.5.0",
 		"@atlaskit/spinner": "20.4.4",
-		"@atlaskit/tmp-editor-statsig": "^218.0.0",
+		"@atlaskit/tmp-editor-statsig": "^219.0.0",
 		"@atlaskit/tokens": "20.1.0",
-		"@atlaskit/tooltip": "^24.3.0",
+		"@atlaskit/tooltip": "^24.4.0",
 		"@atlaskit/visually-hidden": "^4.4.0",
 		"@babel/runtime": "^7.0.0",
 		"@compiled/react": "^1.0.2",
@@ -65,7 +65,7 @@
 		"memoize-one": "^6.0.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^126.4.0",
+		"@atlaskit/editor-common": "^127.1.0",
 		"react": "^18.2.0 || ^19.2.0",
 		"react-intl": "^5.25.1 || ^6.0.0 || ^7.0.0"
 	},